Bläddra i källkod

Upgrade to Physx 3.3.2

Daniele Bartolini 10 år sedan
förälder
incheckning
efba41315e
3 ändrade filer med 21 tillägg och 32 borttagningar
  1. 15 30
      genie/crown.lua
  2. 2 0
      genie/genie.lua
  3. 4 2
      genie/toolchain.lua

+ 15 - 30
genie/crown.lua

@@ -198,20 +198,15 @@ function crown_project(_name, _kind, _defines)
 			linkoptions {
 				"-rdynamic",
 				"-Wl,--start-group $(addprefix -l," ..
-				"	LowLevelClothCHECKED" ..
-				"	PhysX3CHECKED " ..
-				"	PhysX3CommonCHECKED" ..
-				"	PxTaskCHECKED" ..
-				"	LowLevelCHECKED" ..
-				"	PhysX3CharacterKinematicCHECKED" ..
-				"	PhysX3CookingCHECKED" ..
+				"	PhysX3CHECKED_x64" ..
+				"	PhysX3CommonCHECKED_x64" ..
+				"	PhysX3CookingCHECKED_x64" ..
+				"	PhysX3CharacterKinematicCHECKED_x64" ..
 				"	PhysX3ExtensionsCHECKED" ..
 				"	PhysX3VehicleCHECKED" ..
 				"	PhysXProfileSDKCHECKED" ..
 				"	PhysXVisualDebuggerSDKCHECKED" ..
-				"	PvdRuntimeCHECKED" ..
-				"	SceneQueryCHECKED" ..
-				"	SimulationControllerCHECKED" ..
+				"	PxTaskCHECKED" ..
 				") -Wl,--end-group"
 			}
 
@@ -220,40 +215,30 @@ function crown_project(_name, _kind, _defines)
 			{
 				"-rdynamic",
 				"-Wl,--start-group $(addprefix -l," ..
-				"	LowLevelClothPROFILE" ..
-				"	PhysX3PROFILE " ..
-				"	PhysX3CommonPROFILE" ..
-				"	PxTaskPROFILE" ..
-				"	LowLevelPROFILE" ..
-				"	PhysX3CharacterKinematicPROFILE" ..
-				"	PhysX3CookingPROFILE" ..
+				"	PhysX3PROFILE_x64" ..
+				"	PhysX3CommonPROFILE_x64" ..
+				"	PhysX3CookingPROFILE_x64" ..
+				"	PhysX3CharacterKinematicPROFILE_x64" ..
 				"	PhysX3ExtensionsPROFILE" ..
 				"	PhysX3VehiclePROFILE" ..
 				"	PhysXProfileSDKPROFILE" ..
 				"	PhysXVisualDebuggerSDKPROFILE" ..
-				"	PvdRuntimePROFILE" ..
-				"	SceneQueryPROFILE" ..
-				"	SimulationControllerPROFILE" ..
+				"	PxTaskPROFILE" ..
 				") -Wl,--end-group"
 			}
 
 		configuration { "release", "linux-*" }
 			linkoptions {
 				"-Wl,--start-group $(addprefix -l," ..
-				"	LowLevelCloth" ..
-				"	PhysX3 " ..
-				"	PhysX3Common" ..
-				"	PxTask" ..
-				"	LowLevel" ..
-				"	PhysX3CharacterKinematic" ..
-				"	PhysX3Cooking" ..
+				"	PhysX3_x64" ..
+				"	PhysX3Common_x64" ..
+				"	PhysX3Cooking_x64" ..
+				"	PhysX3CharacterKinematic_x64" ..
 				"	PhysX3Extensions" ..
 				"	PhysX3Vehicle" ..
 				"	PhysXProfileSDK" ..
 				"	PhysXVisualDebuggerSDK" ..
-				"	PvdRuntime" ..
-				"	SceneQuery" ..
-				"	SimulationController" ..
+				"	PxTask" ..
 				") -Wl,--end-group"
 			}
 

+ 2 - 0
genie/genie.lua

@@ -69,12 +69,14 @@ configuration { "x32", "linux-*" }
 	postbuildcommands {
 		"cp    " .. CROWN_THIRD_DIR .. "luajit/pre/linux_x86/luajit " .. CROWN_DIR .. ".build/linux32/bin",
 		"cp -r " .. CROWN_THIRD_DIR .. "luajit/src/jit " ..              CROWN_DIR .. ".build/linux32/bin",
+		"cp -r " .. "$(PHYSX_SDK_LINUX)/Bin/linux32/libPhysX3* " ..      CROWN_DIR .. ".build/linux32/bin",
 	}
 
 configuration { "x64", "linux-*" }
 	postbuildcommands {
 		"cp    " .. CROWN_THIRD_DIR .. "luajit/pre/linux_x64/luajit " .. CROWN_DIR .. ".build/linux64/bin",
 		"cp -r " .. CROWN_THIRD_DIR .. "luajit/src/jit " ..              CROWN_DIR .. ".build/linux64/bin",
+		"cp -r " .. "$(PHYSX_SDK_LINUX)/Bin/linux64/libPhysX3* " ..      CROWN_DIR .. ".build/linux64/bin",
 	}
 
 configuration { "x32", "vs*" }

+ 4 - 2
genie/toolchain.lua

@@ -125,7 +125,8 @@ function toolchain(build_dir, lib_dir)
 		objdir (build_dir .. "linux32" .. "/obj")
 		libdirs {
 			lib_dir .. "../.build/linux32/bin",
-			"$(PHYSX_SDK_LINUX)/Lib/linux32"
+			"$(PHYSX_SDK_LINUX)/Lib/linux32",
+			"$(PHYSX_SDK_LINUX)/Bin/linux32",
 		}
 		buildoptions {
 			"-m32",
@@ -137,7 +138,8 @@ function toolchain(build_dir, lib_dir)
 		objdir (build_dir .. "linux64" .. "/obj")
 		libdirs {
 			lib_dir .. "../.build/linux64/bin",
-			"$(PHYSX_SDK_LINUX)/Lib/linux64"
+			"$(PHYSX_SDK_LINUX)/Lib/linux64",
+			"$(PHYSX_SDK_LINUX)/Bin/linux64",
 		}
 		buildoptions {
 			"-m64",