Commit: ce352ceb2739d3b9119a0854f465229dd7f821e2 - HotshotJniGen (git)

Commit MetaInfo

• Révision: ce352ceb2739d3b9119a0854f465229dd7f821e2 (tree)
• l'heure: 2024-01-18 04:10:02
• Auteur: Hotshot5000 <sebastian_bugiu@yaho...>
• Commiter: Hotshot5000

Message de Log

Removed x86_64 and simulator builds since we only use a device.

Change Summary

• modified: gdx-jnigen/src/main/resources/com/badlogic/gdx/jnigen/resources/scripts/build-ios.xml.template

Modification

--- a/gdx-jnigen/src/main/resources/com/badlogic/gdx/jnigen/resources/scripts/build-ios.xml.template
+++ b/gdx-jnigen/src/main/resources/com/badlogic/gdx/jnigen/resources/scripts/build-ios.xml.template
@@ -97,113 +97,6 @@
 		<mkdir dir="${libsDir}"/>
 	</target>
 	
-	<!-- compiles all C and C++ files to object files in the build directory, for x86_64 builds-->
-	<target name="compile-x86_64" depends="create-build-dir">
-		<apply failonerror="false" executable="${g++}" dest="${buildDir}/x86_64" verbose="true">
-			<arg line="-isysroot ${iphonesimulator-sdk} -arch x86_64 -mios-simulator-version-min=${minIOSVersion} ${g++-opts}"/>
-			<arg value="-Ijni-headers"/>
-			<arg value="-Ijni-headers/${jniPlatform}"/>
-			<arg value="-I."/>
-			<arg value="-g"/>
-			%headerDirs%
-			<srcfile/>
-			<arg value="-o"/>
-			<targetfile/>
-			<fileset refid="g++-files"/>
-			<compositemapper>
-				<mapper type="glob" from="*.cpp" to="*.o"/>
-				<mapper type="glob" from="*.mm" to="*.o"/>
-			</compositemapper>
-		</apply>
-		<apply failonerror="false" executable="${gcc}" dest="${buildDir}/x86_64" verbose="true">
-			<arg line="-isysroot ${iphonesimulator-sdk} -arch x86_64 -mios-simulator-version-min=${minIOSVersion} ${gcc-opts}"/>
-			<arg value="-Ijni-headers"/>
-			<arg value="-Ijni-headers/${jniPlatform}"/>
-			<arg value="-I."/>
-			<arg value="-g"/>
-			%headerDirs%
-			<srcfile/>
-			<arg value="-o"/>
-			<targetfile/>
-			<fileset refid="gcc-files"/>
-			<compositemapper>
-				<mapper type="glob" from="*.c" to="*.o"/>
-			</compositemapper>
-		</apply>
-	</target>
-
-    <!-- links the shared library based on the previously compiled object files -->
-    <target name="link-x86_64" depends="compile-x86_64">
-        <fileset dir="${buildDir}/x86_64" id="objFileSet">
-            <patternset>
-                <include name="**/*.o" />
-            </patternset>
-        </fileset>
-        <pathconvert pathsep=" " property="objFiles" refid="objFileSet" />
-        <mkdir dir="${libsDir}" />
-        <exec executable="${linker}" failonerror="false" dir="${buildDir}/x86_64">
-			<arg line="-isysroot ${iphonesimulator-sdk} -arch x86_64 -mios-simulator-version-min=${minIOSVersion} ${linker-opts}"/>
-            <arg value="-o" />
-            <arg path="${buildDir}/x86_64/${libName}" />
-            <arg line="${objFiles}"/>
-            <arg line="${libraries}" />
-        </exec>
-    </target>
-
-
-    <!-- compiles all C and C++ files to object files in the build directory, for arm64 simulator builds-->
-    <target name="compile-arm64-simulator" depends="create-build-dir">
-        <apply failonerror="false" executable="${g++}" dest="${buildDir}/arm64-simulator" verbose="true">
-            <arg line="-isysroot ${iphonesimulator-sdk} -arch arm64 -mios-simulator-version-min=${minIOSVersion} ${g++-opts}"/>
-            <arg value="-Ijni-headers"/>
-            <arg value="-Ijni-headers/${jniPlatform}"/>
-            <arg value="-I."/>
-            <arg value="-g"/>
-            %headerDirs%
-            <srcfile/>
-            <arg value="-o"/>
-            <targetfile/>
-            <fileset refid="g++-files"/>
-            <compositemapper>
-                <mapper type="glob" from="*.cpp" to="*.o"/>
-                <mapper type="glob" from="*.mm" to="*.o"/>
-            </compositemapper>
-        </apply>
-        <apply failonerror="false" executable="${gcc}" dest="${buildDir}/arm64-simulator" verbose="true">
-            <arg line="-isysroot ${iphonesimulator-sdk} -arch arm64 -mios-simulator-version-min=${minIOSVersion} ${gcc-opts}"/>
-            <arg value="-Ijni-headers"/>
-            <arg value="-Ijni-headers/${jniPlatform}"/>
-            <arg value="-I."/>
-            <arg value="-g"/>
-            %headerDirs%
-            <srcfile/>
-            <arg value="-o"/>
-            <targetfile/>
-            <fileset refid="gcc-files"/>
-            <compositemapper>
-                <mapper type="glob" from="*.c" to="*.o"/>
-            </compositemapper>
-        </apply>
-    </target>
-
-    <!-- links the shared library based on the previously compiled object files -->
-    <target name="link-arm64-simulator" depends="compile-arm64-simulator">
-        <fileset dir="${buildDir}/arm64-simulator" id="objFileSetArm64Simulator">
-            <patternset>
-                <include name="**/*.o" />
-            </patternset>
-        </fileset>
-        <pathconvert pathsep=" " property="objFilesArm64Simulator" refid="objFileSetArm64Simulator" />
-        <mkdir dir="${libsDir}" />
-        <exec executable="${linker}" failonerror="false" dir="${buildDir}/arm64-simulator">
-            <arg line="-isysroot ${iphonesimulator-sdk} -arch arm64 -mios-simulator-version-min=${minIOSVersion} ${linker-opts}"/>
-            <arg value="-o" />
-            <arg path="${buildDir}/arm64-simulator/${libName}" />
-            <arg line="${objFilesArm64Simulator}"/>
-            <arg line="${libraries}" />
-        </exec>
-    </target>
-	
 	<!-- compiles all C and C++ files to object files in the build directory, for arm64 builds-->
 	<target name="compile-arm64" depends="create-build-dir">
 		<apply failonerror="true" executable="${g++}" dest="${buildDir}/arm64" verbose="true">
@@ -257,13 +150,13 @@
         </exec>
     </target>
 
-	<target name="archive-fat" depends="link-x86_64,link-arm64-simulator,link-arm64">
+	<target name="archive-fat" depends="link-arm64">
 	    <mkdir dir="${buildDir}/device/${libName}.framework/"/>
 		<copy file="${buildDir}/arm64/${libName}" tofile="${buildDir}/device/${libName}.framework/${libName}"/>
 	    <mkdir dir="${buildDir}/simulator/${libName}.framework/"/>
-        <exec executable="lipo" failonerror="true" dir="${buildDir}">
+        <!--<exec executable="lipo" failonerror="true" dir="${buildDir}">
             <arg line="-create -output simulator/${libName}.framework/${libName} x86_64/${libName} arm64-simulator/${libName}"/>
-        </exec>
+        </exec>-->
 	</target>
 
     <target name="build-plist-device" depends="archive-fat">
@@ -288,34 +181,10 @@
         </exec>
     </target>
 
-    <target name="build-plist-simulator" depends="archive-fat">
-        <copy file="Info.plist" tofile="${buildDir}/simulator/${libName}.framework/Info.plist"/>
-        <exec executable="/usr/libexec/PlistBuddy" failonerror="true" dir="${buildDir}">
-            <arg value="-c"/>
-            <arg value="Set :CFBundleName ${libName}"/>
-            <arg value="-c"/>
-            <arg value="Set :CFBundleExecutable ${libName}"/>
-            <arg value="-c"/>
-            <arg value="Set :DTPlatformName iphonesimulator"/>
-            <arg value="-c"/>
-            <arg value="Set :CFBundleIdentifier ${xcframeworkBundleIdentifier}"/>
-            <arg value="-c"/>
-            <arg value="Set :MinimumOSVersion ${minIOSVersion}"/>
-            <arg value="${absolute.buildDir}/simulator/${libName}.framework/Info.plist"/>
-        </exec>
-        <exec executable="plutil" failonerror="true" dir="${buildDir}">
-            <arg line="-convert"/>
-            <arg line="binary1"/>
-            <arg line="${absolute.buildDir}/simulator/${libName}.framework/Info.plist"/>
-        </exec>
-    </target>
 
-    <target name="generate-dsyms" depends="build-plist-device,build-plist-simulator">
-		<exec executable="dsymutil" failonerror="true" dir="${buildDir}">
-			<arg line="${absolute.buildDir}/simulator/${libName}.framework/${libName}"/>
-			<arg line="-o"/>
-			<arg line="${absolute.buildDir}/simulator/${libName}.framework.dSYM"/>
-		</exec>
+
+    <target name="generate-dsyms" depends="build-plist-device">
+
 		<exec executable="dsymutil" failonerror="true" dir="${buildDir}">
 			<arg line="${absolute.buildDir}/device/${libName}.framework/${libName}"/>
 			<arg line="-o"/>
@@ -325,10 +194,7 @@
 
 
     <target name="strip" depends="generate-dsyms">
-		<exec executable="strip" failonerror="true" dir="${buildDir}">
-			<arg line="-x"/>
-			<arg line="${absolute.buildDir}/simulator/${libName}.framework/${libName}"/>
-		</exec>
+
 		<exec executable="strip" failonerror="true" dir="${buildDir}">
 			<arg line="-x"/>
 			<arg line="${absolute.buildDir}/device/${libName}.framework/${libName}"/>
@@ -344,11 +210,11 @@
 			<arg line="-debug-symbols"/>
 			<arg line="${absolute.buildDir}/device/${libName}.framework.dSYM"/>
 
-			<arg line="-framework"/>
+			<!--<arg line="-framework"/>
 			<arg line="${buildDir}/simulator/${libName}.framework"/>
 			<arg line="-debug-symbols"/>
 			<arg line="${absolute.buildDir}/simulator/${libName}.framework.dSYM"/>
-
+                        -->
 			<arg line="-output"/>
 			<arg line="${libsDir}/${xcframeworkName}.xcframework"/>
 		</exec>