Daniele Bartolini 10 lat temu
rodzic
commit
477a58234f
2 zmienionych plików z 13 dodań i 20 usunięć
  1. 13 19
      genie/crown.lua
  2. 0 1
      genie/toolchain.lua

+ 13 - 19
genie/crown.lua

@@ -29,11 +29,9 @@ function crown_project(_name, _kind, _defines)
 			CROWN_DIR .. "src/renderers",
 			CROWN_DIR .. "src/resource",
 			CROWN_DIR .. "src/world",
+			CROWN_DIR .. "third/bx/include",
 			CROWN_DIR .. "third/bgfx/include",
 			CROWN_DIR .. "third/bgfx/src",
-			CROWN_DIR .. "third/bx/include",
-			CROWN_DIR .. "third/freetype",
-			CROWN_DIR .. "third/stb_image",
 			CROWN_DIR .. "third/stb_vorbis",
 		}
 
@@ -123,8 +121,8 @@ function crown_project(_name, _kind, _defines)
 				"X11",
 				"Xrandr",
 				"pthread",
-				"GL",
 				"dl",
+				"GL",
 			}
 
 		configuration { "vs*" }
@@ -166,10 +164,6 @@ function crown_project(_name, _kind, _defines)
 					"	PhysX3Cooking"            .. config .. "_" .. platform ..
 					"	PhysX3CharacterKinematic" .. config .. "_" .. platform ..
 					"	PhysX3Extensions"         .. config ..
-					"	PhysX3Vehicle"            .. config ..
-					"	PhysXProfileSDK"          .. config ..
-					"	PhysXVisualDebuggerSDK"   .. config ..
-					"	PxTask"                   .. config ..
 					") -Wl,--end-group"
 				}
 			end
@@ -197,10 +191,10 @@ function crown_project(_name, _kind, _defines)
 
 			if os == "windows" then
 				links {
-					"PhysX3CharacterKinematic" .. config .. "_" .. platform,
 					"PhysX3"                   .. config .. "_" .. platform,
 					"PhysX3Common"             .. config .. "_" .. platform,
 					"PhysX3Cooking"            .. config .. "_" .. platform,
+					"PhysX3CharacterKinematic" .. config .. "_" .. platform,
 					"PhysX3Extensions",
 				}
 			end
@@ -243,16 +237,16 @@ function crown_project(_name, _kind, _defines)
 			}
 
 		configuration { "x32", "debug", "linux-*" }
-			links_physx("CHECKED", "linux", "x86")
+			links_physx("DEBUG", "linux", "x86")
 
 		configuration { "x64", "debug", "linux-*" }
-			links_physx("CHECKED", "linux", "x64")
+			links_physx("DEBUG", "linux", "x64")
 
 		configuration { "x32", "development", "linux-*" }
-			links_physx("PROFILE", "linux", "x86")
+			links_physx("CHECKED", "linux", "x86")
 
 		configuration { "x64", "development", "linux-*" }
-			links_physx("PROFILE", "linux", "x64")
+			links_physx("CHECKED", "linux", "x64")
 
 		configuration { "x32", "release", "linux-*" }
 			links_physx("", "linux", "x86")
@@ -261,25 +255,25 @@ function crown_project(_name, _kind, _defines)
 			links_physx("", "linux", "x64")
 
 		configuration { "debug", "android-arm" }
-			links_physx("CHECKED", "android", "")
+			links_physx("DEBUG", "android", "")
 
 		configuration { "development", "android-arm" }
-			links_physx("PROFILE", "android", "")
+			links_physx("CHECKED", "android", "")
 
 		configuration { "release", "android-arm" }
 			links_physx("", "android", "")
 
 		configuration { "debug", "x32", "vs*"}
-			links_physx("CHECKED", "windows", "x86")
+			links_physx("DEBUG", "windows", "x86")
 
 		configuration { "debug", "x64", "vs*" }
-			links_physx("CHECKED", "windows", "x64")
+			links_physx("DEBUG", "windows", "x64")
 
 		configuration { "development", "x32", "vs*" }
-			links_physx("PROFILE", "windows", "x86")
+			links_physx("CHECKED", "windows", "x86")
 
 		configuration { "development", "x64", "vs*" }
-			links_physx("PROFILE", "windows", "x64")
+			links_physx("CHECKED", "windows", "x64")
 
 		configuration { "release", "x32", "vs*" }
 			links_physx("", "windows", "x86")

+ 0 - 1
genie/toolchain.lua

@@ -179,7 +179,6 @@ function toolchain(build_dir, lib_dir)
 			"-ffunction-sections",
 			"-Wno-psabi", -- note: the mangling of 'va_list' has changed in GCC 4.4.0
 			"-Wunused-value",
-			-- "-Wundef", -- note: avoids PhysX warnings
 		}
 		buildoptions_cpp {
 			"-std=c++03",