Ver código fonte

Fix android build

Daniele Bartolini 10 anos atrás
pai
commit
8d28da74ed
2 arquivos alterados com 20 adições e 20 exclusões
  1. 19 19
      genie/crown.lua
  2. 1 1
      src/device_options.h

+ 19 - 19
genie/crown.lua

@@ -157,11 +157,11 @@ function crown_project(_name, _kind, _defines)
 			if os == "linux" then
 				linkoptions {
 					"-Wl,--start-group $(addprefix -l," ..
-					"	PhysX3"                   .. config .. "_" .. platform ..
-					"	PhysX3Common"             .. config .. "_" .. platform ..
-					"	PhysX3Cooking"            .. config .. "_" .. platform ..
-					"	PhysX3CharacterKinematic" .. config .. "_" .. platform ..
-					"	PhysX3Extensions"         .. config ..
+					" PhysX3"                   .. config .. "_" .. platform ..
+					" PhysX3Common"             .. config .. "_" .. platform ..
+					" PhysX3Cooking"            .. config .. "_" .. platform ..
+					" PhysX3CharacterKinematic" .. config .. "_" .. platform ..
+					" PhysX3Extensions"         .. config ..
 					") -Wl,--end-group"
 				}
 			end
@@ -169,20 +169,20 @@ function crown_project(_name, _kind, _defines)
 			if os == "android" then
 				linkoptions {
 					"-Wl,--start-group $(addprefix -l," ..
-					"	LowLevelCloth"            .. config ..
-					"	PhysX3 "                  .. config ..
-					"	PhysX3Common"             .. config ..
-					"	PxTask"                   .. config ..
-					"	LowLevel"                 .. config ..
-					"	PhysX3CharacterKinematic" .. config ..
-					"	PhysX3Cooking"            .. config ..
-					"	PhysX3Extensions"         .. config ..
-					"	PhysX3Vehicle"            .. config ..
-					"	PhysXProfileSDK"          .. config ..
-					"	PhysXVisualDebuggerSDK"   .. config ..
-					"	PvdRuntime"               .. config ..
-					"	SceneQuery"               .. config ..
-					"	SimulationController"     .. config ..
+					" PhysX3Common"             .. config ..
+					" PvdRuntime"               .. config ..
+					" SimulationController"     .. config ..
+					" SceneQuery"               .. config ..
+					" LowLevel"                 .. config ..
+					" LowLevelCloth"            .. config ..
+					" PhysX3"                   .. config ..
+					" PhysX3Vehicle"            .. config ..
+					" PhysX3Cooking"            .. config ..
+					" PhysX3Extensions"         .. config ..
+					" PhysX3CharacterKinematic" .. config ..
+					" PhysXProfileSDK"          .. config ..
+					" PxTask"                   .. config ..
+					" PhysXVisualDebuggerSDK"   .. config ..
 					") -Wl,--end-group"
 				}
 			end

+ 1 - 1
src/device_options.h

@@ -35,7 +35,7 @@ struct DeviceOptions
 	uint16_t window_height() const { return _window_height; }
 
 #if CROWN_PLATFORM_ANDROID
-	const AAssetManager* asset_manager() const;
+	const AAssetManager* asset_manager() const { return _asset_manager; }
 #endif // CROWN_PLATFORM_ANDROID
 
 private: