Merge pull request #63 from Berstanio/fix/allow-all-file-endings

Allow processing all files that are defined by the includes
libgdx · Apr 14, 2024 · 8a9004e · 8a9004e
2 parents 797bbdd + cc2076c
commit 8a9004e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,5 @@
 [2.5.2]
+- Compile all files that are defined by cIncludes/cExcludes/cppIncludes/cppExcludes
 - Add support for defining multiple source directories in the gradle plugin
 
 [2.5.1]

diff --git a/...nigen/src/main/resources/com/badlogic/gdx/jnigen/resources/scripts/build-ios.xml.template b/...nigen/src/main/resources/com/badlogic/gdx/jnigen/resources/scripts/build-ios.xml.template
@@ -111,8 +111,7 @@
 			<targetfile/>
 			<fileset refid="g++-files"/>
 			<compositemapper>
-				<mapper type="glob" from="*.cpp" to="*.o"/>
-				<mapper type="glob" from="*.mm" to="*.o"/>
+				<mapper type="glob" from="*" to="*.o"/>
 			</compositemapper>
 		</apply>
 		<apply failonerror="true" executable="${gcc}" dest="${buildDir}/x86_64" verbose="true">
@@ -127,7 +126,7 @@
 			<targetfile/>
 			<fileset refid="gcc-files"/>
 			<compositemapper>
-				<mapper type="glob" from="*.c" to="*.o"/>
+				<mapper type="glob" from="*" to="*.o"/>
 			</compositemapper>
 		</apply>
 	</target>
@@ -165,8 +164,7 @@
             <targetfile/>
             <fileset refid="g++-files"/>
             <compositemapper>
-                <mapper type="glob" from="*.cpp" to="*.o"/>
-                <mapper type="glob" from="*.mm" to="*.o"/>
+                <mapper type="glob" from="*" to="*.o"/>
             </compositemapper>
         </apply>
         <apply failonerror="true" executable="${gcc}" dest="${buildDir}/arm64-simulator" verbose="true">
@@ -181,7 +179,7 @@
             <targetfile/>
             <fileset refid="gcc-files"/>
             <compositemapper>
-                <mapper type="glob" from="*.c" to="*.o"/>
+                <mapper type="glob" from="*" to="*.o"/>
             </compositemapper>
         </apply>
     </target>
@@ -218,8 +216,7 @@
 			<targetfile/>
 			<fileset refid="g++-files"/>
 			<compositemapper>
-				<mapper type="glob" from="*.cpp" to="*.o"/>
-				<mapper type="glob" from="*.mm" to="*.o"/>
+				<mapper type="glob" from="*" to="*.o"/>
 			</compositemapper>
 		</apply>
 		<apply failonerror="true" executable="${gcc}" dest="${buildDir}/arm64" verbose="true">
@@ -234,7 +231,7 @@
 			<targetfile/>
 			<fileset refid="gcc-files"/>
 			<compositemapper>
-				<mapper type="glob" from="*.c" to="*.o"/>
+				<mapper type="glob" from="*" to="*.o"/>
 			</compositemapper>
 		</apply>
 	</target>

diff --git a/...en/src/main/resources/com/badlogic/gdx/jnigen/resources/scripts/build-target.xml.template b/...en/src/main/resources/com/badlogic/gdx/jnigen/resources/scripts/build-target.xml.template
@@ -121,8 +121,7 @@
 			<targetfile/>
 			<fileset refid="g++-files"/>
 			<compositemapper>
-				<mapper type="glob" from="*.cpp" to="*.o"/>
-				<mapper type="glob" from="*.mm" to="*.o"/>
+				<mapper type="glob" from="*" to="*.o"/>
 			</compositemapper>
 		</apply>
 		<apply failonerror="true" executable="${gcc}" dest="${buildDir}" verbose="true">
@@ -136,8 +135,7 @@
 			<targetfile/>
 			<fileset refid="gcc-files"/>
 			<compositemapper>
-				<mapper type="glob" from="*.c" to="*.o"/>
-				<mapper type="glob" from="*.m" to="*.o"/>
+				<mapper type="glob" from="*" to="*.o"/>
 			</compositemapper>
 		</apply>
 	</target>