Browse Source

Cleaned ios native project

joliver82 1 year ago
parent
commit
f35a2b46a9

+ 5 - 5
jme3-ios-native/export.sh

@@ -1,11 +1,11 @@
-rm -rf intermediate-builds release template/META-INF/robovm/ios/libs/jme3-ios-native-lib.xcframework
+rm -rf intermediate-builds release template/META-INF/robovm/ios/libs/jme3-ios-native.xcframework
 mkdir intermediate-builds release
-xcodebuild archive -project jme3-ios-native-lib.xcodeproj -scheme jme3-ios-native-lib -destination generic/platform=iOS -archivePath intermediate-builds/jme3-ios-native-lib_iOS SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES
-xcodebuild archive -project jme3-ios-native-lib.xcodeproj -scheme jme3-ios-native-lib -destination generic/platform="iOS Simulator" -archivePath intermediate-builds/jme3-ios-native-lib_iOS-Simulator SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES
+xcodebuild archive -project jme3-ios-native.xcodeproj -scheme jme3-ios-native -destination generic/platform=iOS -archivePath intermediate-builds/jme3-ios-native_iOS SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES
+xcodebuild archive -project jme3-ios-native.xcodeproj -scheme jme3-ios-native -destination generic/platform="iOS Simulator" -archivePath intermediate-builds/jme3-ios-native_iOS-Simulator SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES
 
-xcodebuild -create-xcframework -framework intermediate-builds/jme3-ios-native-lib_iOS.xcarchive/Products/Library/Frameworks/jme3_ios_native_lib.framework -framework intermediate-builds/jme3-ios-native-lib_iOS-Simulator.xcarchive/Products/Library/Frameworks/jme3_ios_native_lib.framework -output template/META-INF/robovm/ios/libs/jme3-ios-native-lib.xcframework
+xcodebuild -create-xcframework -framework intermediate-builds/jme3-ios-native_iOS.xcarchive/Products/Library/Frameworks/jme3_ios_native.framework -framework intermediate-builds/jme3-ios-native_iOS-Simulator.xcarchive/Products/Library/Frameworks/jme3_ios_native.framework -output template/META-INF/robovm/ios/libs/jme3-ios-native.xcframework
 
 cd template
-zip -r ../release/jme3-ios-native-lib.jar META-INF
+zip -r ../release/jme3-ios-native.jar META-INF
 cd ..
 

+ 0 - 7
jme3-ios-native/jme3-ios-native-lib.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:jme3-ios-native-lib.xcodeproj">
-   </FileRef>
-</Workspace>

+ 0 - 8
jme3-ios-native/jme3-ios-native-lib.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

BIN
jme3-ios-native/jme3-ios-native-lib.xcodeproj/project.xcworkspace/xcuserdata/v1r7ua1.xcuserdatad/UserInterfaceState.xcuserstate


+ 0 - 14
jme3-ios-native/jme3-ios-native-lib.xcodeproj/xcuserdata/v1r7ua1.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>jme3-ios-native-lib.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>

+ 22 - 22
jme3-ios-native/jme3-ios-native-lib.xcodeproj/project.pbxproj → jme3-ios-native/jme3-ios-native.xcodeproj/project.pbxproj

@@ -9,7 +9,7 @@
 /* Begin PBXBuildFile section */
 		BB0987B82CA2B31900AF4C26 /* com_jme3_util_IosNativeBufferAllocator.c in Sources */ = {isa = PBXBuildFile; fileRef = BB0987B62CA2B31900AF4C26 /* com_jme3_util_IosNativeBufferAllocator.c */; };
 		BB0987B92CA2B31900AF4C26 /* com_jme3_util_IosNativeBufferAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = BB0987B72CA2B31900AF4C26 /* com_jme3_util_IosNativeBufferAllocator.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		BBAA18642C9CC9B40015DF5E /* jme3_ios_native_lib.h in Headers */ = {isa = PBXBuildFile; fileRef = BBAA18622C9CC9B40015DF5E /* jme3_ios_native_lib.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		BBAA18642C9CC9B40015DF5E /* jme3_ios_native.h in Headers */ = {isa = PBXBuildFile; fileRef = BBAA18622C9CC9B40015DF5E /* jme3_ios_native.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BBAA18752C9CCACB0015DF5E /* com_jme3_audio_ios_IosEFX.c in Sources */ = {isa = PBXBuildFile; fileRef = BBAA186A2C9CCACB0015DF5E /* com_jme3_audio_ios_IosEFX.c */; };
 		BBAA18762C9CCACB0015DF5E /* com_jme3_audio_ios_IosALC.c in Sources */ = {isa = PBXBuildFile; fileRef = BBAA186B2C9CCACB0015DF5E /* com_jme3_audio_ios_IosALC.c */; };
 		BBAA18772C9CCACB0015DF5E /* com_jme3_audio_ios_IosEFX.h in Headers */ = {isa = PBXBuildFile; fileRef = BBAA186C2C9CCACB0015DF5E /* com_jme3_audio_ios_IosEFX.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -26,8 +26,8 @@
 /* Begin PBXFileReference section */
 		BB0987B62CA2B31900AF4C26 /* com_jme3_util_IosNativeBufferAllocator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = com_jme3_util_IosNativeBufferAllocator.c; sourceTree = "<group>"; };
 		BB0987B72CA2B31900AF4C26 /* com_jme3_util_IosNativeBufferAllocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = com_jme3_util_IosNativeBufferAllocator.h; sourceTree = "<group>"; };
-		BBAA185F2C9CC9B40015DF5E /* jme3_ios_native_lib.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = jme3_ios_native_lib.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		BBAA18622C9CC9B40015DF5E /* jme3_ios_native_lib.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = jme3_ios_native_lib.h; sourceTree = "<group>"; };
+		BBAA185F2C9CC9B40015DF5E /* jme3_ios_native.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = jme3_ios_native.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		BBAA18622C9CC9B40015DF5E /* jme3_ios_native.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = jme3_ios_native.h; sourceTree = "<group>"; };
 		BBAA18632C9CC9B40015DF5E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		BBAA186A2C9CCACB0015DF5E /* com_jme3_audio_ios_IosEFX.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = com_jme3_audio_ios_IosEFX.c; sourceTree = "<group>"; };
 		BBAA186B2C9CCACB0015DF5E /* com_jme3_audio_ios_IosALC.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = com_jme3_audio_ios_IosALC.c; sourceTree = "<group>"; };
@@ -57,7 +57,7 @@
 		BBAA18552C9CC9B40015DF5E = {
 			isa = PBXGroup;
 			children = (
-				BBAA18612C9CC9B40015DF5E /* jme3-ios-native-lib */,
+				BBAA18612C9CC9B40015DF5E /* src */,
 				BBAA18602C9CC9B40015DF5E /* Products */,
 				BBAA18802C9CCB710015DF5E /* Frameworks */,
 			);
@@ -66,12 +66,12 @@
 		BBAA18602C9CC9B40015DF5E /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				BBAA185F2C9CC9B40015DF5E /* jme3_ios_native_lib.framework */,
+				BBAA185F2C9CC9B40015DF5E /* jme3_ios_native.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		BBAA18612C9CC9B40015DF5E /* jme3-ios-native-lib */ = {
+		BBAA18612C9CC9B40015DF5E /* src */ = {
 			isa = PBXGroup;
 			children = (
 				BB0987B62CA2B31900AF4C26 /* com_jme3_util_IosNativeBufferAllocator.c */,
@@ -86,10 +86,10 @@
 				BBAA18722C9CCACB0015DF5E /* JmeAppHarness.java */,
 				BBAA186E2C9CCACB0015DF5E /* JmeAppHarness.m */,
 				BBAA18712C9CCACB0015DF5E /* JmeIosGLES.m */,
-				BBAA18622C9CC9B40015DF5E /* jme3_ios_native_lib.h */,
+				BBAA18622C9CC9B40015DF5E /* jme3_ios_native.h */,
 				BBAA18632C9CC9B40015DF5E /* Info.plist */,
 			);
-			path = "jme3-ios-native-lib";
+			path = src;
 			sourceTree = "<group>";
 		};
 		BBAA18802C9CCB710015DF5E /* Frameworks */ = {
@@ -111,16 +111,16 @@
 				BBAA187A2C9CCACB0015DF5E /* com_jme3_audio_ios_IosAL.h in Headers */,
 				BB0987B92CA2B31900AF4C26 /* com_jme3_util_IosNativeBufferAllocator.h in Headers */,
 				BBAA18782C9CCACB0015DF5E /* com_jme3_audio_ios_IosALC.h in Headers */,
-				BBAA18642C9CC9B40015DF5E /* jme3_ios_native_lib.h in Headers */,
+				BBAA18642C9CC9B40015DF5E /* jme3_ios_native.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		BBAA185E2C9CC9B40015DF5E /* jme3-ios-native-lib */ = {
+		BBAA185E2C9CC9B40015DF5E /* jme3-ios-native */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = BBAA18672C9CC9B40015DF5E /* Build configuration list for PBXNativeTarget "jme3-ios-native-lib" */;
+			buildConfigurationList = BBAA18672C9CC9B40015DF5E /* Build configuration list for PBXNativeTarget "jme3-ios-native" */;
 			buildPhases = (
 				BBAA185A2C9CC9B40015DF5E /* Headers */,
 				BBAA185B2C9CC9B40015DF5E /* Sources */,
@@ -131,9 +131,9 @@
 			);
 			dependencies = (
 			);
-			name = "jme3-ios-native-lib";
-			productName = "jme3-ios-native-lib";
-			productReference = BBAA185F2C9CC9B40015DF5E /* jme3_ios_native_lib.framework */;
+			name = "jme3-ios-native";
+			productName = "jme3-ios-native";
+			productReference = BBAA185F2C9CC9B40015DF5E /* jme3_ios_native.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 /* End PBXNativeTarget section */
@@ -149,7 +149,7 @@
 					};
 				};
 			};
-			buildConfigurationList = BBAA18592C9CC9B40015DF5E /* Build configuration list for PBXProject "jme3-ios-native-lib" */;
+			buildConfigurationList = BBAA18592C9CC9B40015DF5E /* Build configuration list for PBXProject "jme3-ios-native" */;
 			compatibilityVersion = "Xcode 9.3";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
@@ -162,7 +162,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				BBAA185E2C9CC9B40015DF5E /* jme3-ios-native-lib */,
+				BBAA185E2C9CC9B40015DF5E /* jme3-ios-native */,
 			);
 		};
 /* End PBXProject section */
@@ -327,7 +327,7 @@
 					"/Library/Java/JavaVirtualMachines/jdk-11.0.6.jdk/Contents/Home/include/**",
 					"/Users/runner/hostedtoolcache/Java_Temurin-Hotspot_jdk/11.0.24-8/arm64/Contents/Home/include/**",
 				);
-				INFOPLIST_FILE = "jme3-ios-native-lib/Info.plist";
+				INFOPLIST_FILE = "src/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -335,7 +335,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "jme3.jme3-ios-native-lib";
+				PRODUCT_BUNDLE_IDENTIFIER = "jme3.jme3-ios-native";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SUPPORTS_MACCATALYST = YES;
@@ -361,7 +361,7 @@
 					"/Library/Java/JavaVirtualMachines/jdk-11.0.6.jdk/Contents/Home/include/**",
 					"/Users/runner/hostedtoolcache/Java_Temurin-Hotspot_jdk/11.0.24-8/arm64/Contents/Home/include/**",
 				);
-				INFOPLIST_FILE = "jme3-ios-native-lib/Info.plist";
+				INFOPLIST_FILE = "src/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -369,7 +369,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "jme3.jme3-ios-native-lib";
+				PRODUCT_BUNDLE_IDENTIFIER = "jme3.jme3-ios-native";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SUPPORTS_MACCATALYST = YES;
@@ -384,7 +384,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		BBAA18592C9CC9B40015DF5E /* Build configuration list for PBXProject "jme3-ios-native-lib" */ = {
+		BBAA18592C9CC9B40015DF5E /* Build configuration list for PBXProject "jme3-ios-native" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				BBAA18652C9CC9B40015DF5E /* Debug */,
@@ -393,7 +393,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		BBAA18672C9CC9B40015DF5E /* Build configuration list for PBXNativeTarget "jme3-ios-native-lib" */ = {
+		BBAA18672C9CC9B40015DF5E /* Build configuration list for PBXNativeTarget "jme3-ios-native" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				BBAA18682C9CC9B40015DF5E /* Debug */,

+ 0 - 0
jme3-ios-native/jme3-ios-native-lib/Info.plist → jme3-ios-native/src/Info.plist


+ 0 - 0
jme3-ios-native/jme3-ios-native-lib/JmeAppHarness.java → jme3-ios-native/src/JmeAppHarness.java


+ 0 - 0
jme3-ios-native/jme3-ios-native-lib/JmeAppHarness.m → jme3-ios-native/src/JmeAppHarness.m


+ 0 - 0
jme3-ios-native/jme3-ios-native-lib/JmeIosGLES.m → jme3-ios-native/src/JmeIosGLES.m


+ 0 - 0
jme3-ios-native/jme3-ios-native-lib/com_jme3_audio_ios_IosAL.c → jme3-ios-native/src/com_jme3_audio_ios_IosAL.c


+ 0 - 0
jme3-ios-native/jme3-ios-native-lib/com_jme3_audio_ios_IosAL.h → jme3-ios-native/src/com_jme3_audio_ios_IosAL.h


+ 0 - 0
jme3-ios-native/jme3-ios-native-lib/com_jme3_audio_ios_IosALC.c → jme3-ios-native/src/com_jme3_audio_ios_IosALC.c


+ 0 - 0
jme3-ios-native/jme3-ios-native-lib/com_jme3_audio_ios_IosALC.h → jme3-ios-native/src/com_jme3_audio_ios_IosALC.h


+ 0 - 0
jme3-ios-native/jme3-ios-native-lib/com_jme3_audio_ios_IosEFX.c → jme3-ios-native/src/com_jme3_audio_ios_IosEFX.c


+ 0 - 0
jme3-ios-native/jme3-ios-native-lib/com_jme3_audio_ios_IosEFX.h → jme3-ios-native/src/com_jme3_audio_ios_IosEFX.h


+ 0 - 0
jme3-ios-native/jme3-ios-native-lib/com_jme3_util_IosNativeBufferAllocator.c → jme3-ios-native/src/com_jme3_util_IosNativeBufferAllocator.c


+ 0 - 0
jme3-ios-native/jme3-ios-native-lib/com_jme3_util_IosNativeBufferAllocator.h → jme3-ios-native/src/com_jme3_util_IosNativeBufferAllocator.h


+ 0 - 0
jme3-ios-native/jme3-ios-native-lib/jme-ios.m → jme3-ios-native/src/jme-ios.m


+ 4 - 4
jme3-ios-native/jme3-ios-native-lib/jme3_ios_native_lib.h → jme3-ios-native/src/jme3_ios_native.h

@@ -1,6 +1,6 @@
 //
-//  jme3_ios_native_lib.h
-//  jme3-ios-native-lib
+//  jme3_ios_native.h
+//  jme3-ios-native
 //
 //  Created by v1r7ua1 on 19/09/2024.
 //
@@ -8,10 +8,10 @@
 #import <Foundation/Foundation.h>
 
 //! Project version number for jme3_ios_native_lib.
-FOUNDATION_EXPORT double jme3_ios_native_libVersionNumber;
+FOUNDATION_EXPORT double jme3_ios_nativeVersionNumber;
 
 //! Project version string for jme3_ios_native_lib.
-FOUNDATION_EXPORT const unsigned char jme3_ios_native_libVersionString[];
+FOUNDATION_EXPORT const unsigned char jme3_ios_nativeVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <jme3_ios_native_lib/PublicHeader.h>
 

+ 1 - 1
jme3-ios-native/template/META-INF/robovm/ios/robovm.xml

@@ -3,7 +3,7 @@
         <path>libs</path>
     </frameworkPaths>
     <frameworks>
-        <framework>jme3-ios-native-lib</framework>
+        <framework>jme3-ios-native</framework>
     </frameworks>
 </config>