2
0
Daniele Bartolini 9 жил өмнө
parent
commit
bdedd4b5ac
2 өөрчлөгдсөн 0 нэмэгдсэн , 183 устгасан
  1. 0 152
      scripts/crown.lua
  2. 0 31
      scripts/genie.lua

+ 0 - 152
scripts/crown.lua

@@ -167,158 +167,6 @@ function crown_project(_name, _kind, _defines)
 				"psapi",
 			}
 
-		if _OPTIONS["with-physx"] then
-			local function includedirs_physx(prefix)
-				includedirs {
-					prefix .. "Include",
-					prefix .. "Include/common",
-					prefix .. "Include/characterkinematic",
-					prefix .. "Include/cloth",
-					prefix .. "Include/common",
-					prefix .. "Include/cooking",
-					prefix .. "Include/extensions",
-					prefix .. "Include/foundation",
-					prefix .. "Include/geometry",
-					prefix .. "Include/particles",
-					prefix .. "Include/physxprofilesdk",
-					prefix .. "Include/physxvisualdebuggersdk",
-					prefix .. "Include/pvd",
-					prefix .. "Include/pxtask",
-					prefix .. "Include/vehicle",
-				}
-			end
-
-			local function links_physx(config, os, platform)
-				if os == "linux" then
-					buildoptions {
-						"-Wno-unknown-pragmas",
-						"-Wno-unused-local-typedefs",
-					}
-					linkoptions {
-						"-Wl,--start-group $(addprefix -l," ..
-						" PhysX3"                   .. config .. "_" .. platform ..
-						" PhysX3Common"             .. config .. "_" .. platform ..
-						" PhysX3Cooking"            .. config .. "_" .. platform ..
-						" PhysX3CharacterKinematic" .. config .. "_" .. platform ..
-						" PhysX3Extensions"         .. config ..
-						") -Wl,--end-group"
-					}
-				end
-
-				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 ..
-						") -Wl,--end-group"
-					}
-				end
-
-				if os == "windows" then
-					links {
-						"PhysX3"                   .. config .. "_" .. platform,
-						"PhysX3Common"             .. config .. "_" .. platform,
-						"PhysX3Cooking"            .. config .. "_" .. platform,
-						"PhysX3CharacterKinematic" .. config .. "_" .. platform,
-						"PhysX3Extensions",
-					}
-				end
-			end
-
-			configuration { "android*" }
-				includedirs_physx("$(PHYSX_SDK_ANDROID)/")
-
-			configuration { "linux*" }
-				includedirs_physx("$(PHYSX_SDK_LINUX)/")
-
-			configuration { "vs*" }
-				includedirs_physx("$(PHYSX_SDK_WINDOWS)/")
-
-			configuration { "android-arm" }
-				libdirs {
-					"$(PHYSX_SDK_ANDROID)/Lib/android9_neon",
-				}
-
-			configuration { "x32", "linux-*" }
-				libdirs {
-					"$(PHYSX_SDK_LINUX)/Lib/linux32",
-					"$(PHYSX_SDK_LINUX)/Bin/linux32",
-				}
-
-			configuration { "x64", "linux-*" }
-				libdirs {
-					"$(PHYSX_SDK_LINUX)/Lib/linux64",
-					"$(PHYSX_SDK_LINUX)/Bin/linux64",
-				}
-
-			configuration { "x32", "vs*" }
-				libdirs {
-					"$(PHYSX_SDK_WINDOWS)/Lib/win32",
-				}
-
-			configuration { "x64", "vs*" }
-				libdirs {
-					"$(PHYSX_SDK_WINDOWS)/Lib/win64",
-				}
-
-			configuration { "x32", "debug", "linux-*" }
-				links_physx("DEBUG", "linux", "x86")
-
-			configuration { "x64", "debug", "linux-*" }
-				links_physx("DEBUG", "linux", "x64")
-
-			configuration { "x32", "development", "linux-*" }
-				links_physx("CHECKED", "linux", "x86")
-
-			configuration { "x64", "development", "linux-*" }
-				links_physx("CHECKED", "linux", "x64")
-
-			configuration { "x32", "release", "linux-*" }
-				links_physx("", "linux", "x86")
-
-			configuration { "x64", "release", "linux-*" }
-				links_physx("", "linux", "x64")
-
-			configuration { "debug", "android-arm" }
-				links_physx("DEBUG", "android", "")
-
-			configuration { "development", "android-arm" }
-				links_physx("CHECKED", "android", "")
-
-			configuration { "release", "android-arm" }
-				links_physx("", "android", "")
-
-			configuration { "debug", "x32", "vs*"}
-				links_physx("DEBUG", "windows", "x86")
-
-			configuration { "debug", "x64", "vs*" }
-				links_physx("DEBUG", "windows", "x64")
-
-			configuration { "development", "x32", "vs*" }
-				links_physx("CHECKED", "windows", "x86")
-
-			configuration { "development", "x64", "vs*" }
-				links_physx("CHECKED", "windows", "x64")
-
-			configuration { "release", "x32", "vs*" }
-				links_physx("", "windows", "x86")
-
-			configuration { "release", "x64", "vs*" }
-				links_physx("", "windows", "x64")
-		end
-
 		configuration {}
 
 		files {

+ 0 - 31
scripts/genie.lua

@@ -28,11 +28,6 @@ newoption {
 	description = "Build with Bullet support."
 }
 
-newoption {
-	trigger = "with-physx",
-	description = "Build with PhysX support."
-}
-
 newoption {
 	trigger = "with-tools",
 	description = "Build with tools."
@@ -89,24 +84,12 @@ configuration { "x32", "linux-*" }
 		"cp -r " .. CROWN_THIRD_DIR .. "luajit/src/jit "              .. CROWN_ENGINE_DIR .. "linux32/bin",
 	}
 
-	if _OPTIONS["with-physx"] then
-		postbuildcommands {
-			"cp -r " .. "$(PHYSX_SDK_LINUX)/Bin/linux32/libPhysX3* " .. CROWN_ENGINE_DIR .. "linux32/bin",
-		}
-	end
-
 configuration { "x64", "linux-*" }
 	postbuildcommands {
 		"cp    " .. CROWN_THIRD_DIR .. "luajit/pre/linux_x64/luajit " .. CROWN_ENGINE_DIR .. "linux64/bin",
 		"cp -r " .. CROWN_THIRD_DIR .. "luajit/src/jit "              .. CROWN_ENGINE_DIR .. "linux64/bin",
 	}
 
-	if _OPTIONS["with-physx"] then
-		postbuildcommands {
-			"cp -r " .. "$(PHYSX_SDK_LINUX)/Bin/linux64/libPhysX3* " .. CROWN_ENGINE_DIR .. "linux64/bin",
-		}
-	end
-
 configuration { "x32", "vs*" }
 	postbuildcommands {
 		"cp    " .. CROWN_THIRD_DIR .. "luajit/pre/win_x86/luajit.exe " .. CROWN_ENGINE_DIR .. "win32/bin",
@@ -116,13 +99,6 @@ configuration { "x32", "vs*" }
 		"cp -r " .. CROWN_THIRD_DIR .. "luajit/src/jit "                .. CROWN_ENGINE_DIR .. "win32/bin",
 	}
 
-	if _OPTIONS["with-physx"] then
-		postbuildcommands {
-			"cp    " .. "$(PHYSX_SDK_WINDOWS)/bin/win32/PhysX3* "            .. CROWN_ENGINE_DIR .. "win32/bin",
-			"cp    " .. "$(PHYSX_SDK_WINDOWS)/bin/win32/nvToolsExt32_1.dll " .. CROWN_ENGINE_DIR .. "win32/bin",
-		}
-	end
-
 configuration { "x64", "vs*" }
 	postbuildcommands {
 		"cp    " .. CROWN_THIRD_DIR .. "luajit/pre/win_x64/luajit.exe " .. CROWN_ENGINE_DIR .. "win64/bin",
@@ -131,10 +107,3 @@ configuration { "x64", "vs*" }
 		"cp    " .. CROWN_THIRD_DIR .. "luajit/pre/win_x64/lua51.dll "  .. CROWN_ENGINE_DIR .. "win64/bin",
 		"cp -r " .. CROWN_THIRD_DIR .. "luajit/src/jit "                .. CROWN_ENGINE_DIR .. "win64/bin",
 	}
-
-	if _OPTIONS["with-physx"] then
-		postbuildcommands {
-			"cp    " .. "$(PHYSX_SDK_WINDOWS)/bin/win64/PhysX3* "            .. CROWN_ENGINE_DIR .. "win64/bin",
-			"cp    " .. "$(PHYSX_SDK_WINDOWS)/bin/win64/nvToolsExt64_1.dll " .. CROWN_ENGINE_DIR .. "win64/bin",
-		}
-	end