소스 검색

Remove unnecessary stuff

Daniele Bartolini 11 년 전
부모
커밋
e3f6d2512e
1개의 변경된 파일48개의 추가작업 그리고 99개의 파일을 삭제
  1. 48 99
      premake/premake4.lua

+ 48 - 99
premake/premake4.lua

@@ -98,7 +98,6 @@ solution "crown"
 	end
 
 	flags {
-		"StaticRuntime",
 		"NoMinimalRebuild",
 		"NoPCH",
 		"NoRTTI",
@@ -144,8 +143,7 @@ solution "crown"
 	project "crown"
 		language "C++"
 
-		includedirs
-		{
+		includedirs {
 			CROWN_SOURCE_DIR .. "/engine",
 			CROWN_SOURCE_DIR .. "/engine/core",
 			CROWN_SOURCE_DIR .. "/engine/core/bv",
@@ -169,8 +167,7 @@ solution "crown"
 			CROWN_SOURCE_DIR .. "/engine/world"
 		}
 
-		files
-		{
+		files {
 			CROWN_SOURCE_DIR .. "engine/**.h", 
 			CROWN_SOURCE_DIR .. "engine/**.cpp"
 		}
@@ -178,25 +175,28 @@ solution "crown"
 		configuration { "linux-*" }
 			kind "ConsoleApp"
 
-			buildoptions
-			{
-				"-std=c++03",	
+			buildoptions {
+				"-std=c++03",
+				"-Wall",
+				"-Wextra",
+				-- "-Werror",
+				"-pedantic",
+				"-Wno-unknown-pragmas",
+				"-Wno-unused-local-typedefs"
 			}
 			
-			linkoptions
-			{
-				"-Wl,-rpath=\\$$ORIGIN",
+			linkoptions {
+				"-Wl,-rpath=\\$$ORIGIN"
 			}
 
-			links
-			{
+			links {
 				"Xrandr",
 				"pthread",
 				"dl",
 				"GL",
 				"X11",
 				"openal",
-				"luajit-5.1",
+				"luajit-5.1"
 			}
 
 			includedirs {
@@ -204,8 +204,7 @@ solution "crown"
 				CROWN_SOURCE_DIR .. "/engine/renderers/backend/gl/glx",
 			}
 
-			excludes
-			{
+			excludes {
 				CROWN_SOURCE_DIR .. "engine/os/android/*",
 				CROWN_SOURCE_DIR .. "engine/os/win/*",
 				CROWN_SOURCE_DIR .. "engine/renderers/backend/gl/egl/*",
@@ -213,18 +212,12 @@ solution "crown"
 				CROWN_SOURCE_DIR .. "engine/audio/backend/SLESSoundWorld.cpp",
 			}
 			
-		configuration { "debug", "linux-*" }
-			buildoptions
-			{
-				"-O0",
-				"-Wall",
-				-- "-Werror",
-				"-Wno-unknown-pragmas",
-				"-Wno-unused-local-typedefs",
+		configuration { "linux-*", "debug" }
+			buildoptions {
+				"-O0"
 			}
 
-			linkoptions
-			{ 
+			linkoptions { 
 				"-Wl,--start-group $(addprefix -l," ..
 				"	LowLevelClothCHECKED" ..
 				"	PhysX3CHECKED " ..
@@ -244,16 +237,10 @@ solution "crown"
 			}
 
 		configuration { "linux-*", "development" }
-			buildoptions
-			{
-				"-g",
-				"-pg",
-				"-Wall",
-				-- "-Werror",
-				"-Wno-unknown-pragmas",
-				"-Wno-unused-local-typedefs",
+			buildoptions {
 				"-O2"
 			}
+
 			linkoptions
 			{ 
 				"-Wl,--start-group $(addprefix -l," ..
@@ -274,13 +261,12 @@ solution "crown"
 				") -Wl,--end-group"
 			}
 
-		configuration { "release", "linux-*" }
-			buildoptions
-			{
+		configuration { "linux-*", "release" }
+			buildoptions {
 				"-O2"
 			}
-			linkoptions
-			{ 
+
+			linkoptions { 
 				"-Wl,--start-group $(addprefix -l," ..
 				"	LowLevelCloth" ..
 				"	PhysX3 " ..
@@ -299,16 +285,14 @@ solution "crown"
 				") -Wl,--end-group"
 			}
 
-		configuration { "x32", "linux-*" }
+		configuration { "linux-*", "x32" }
 			targetdir(CROWN_INSTALL_DIR .. "bin/linux32")
 		
-			buildoptions
-			{
-				"-malign-double"
+			buildoptions {
+				"-malign-double" -- Required by PhysX
 			}
 
-			includedirs
-			{
+			includedirs {
 				CROWN_THIRD_DIR .. "luajit/x86/include/luajit-2.0",
 				CROWN_THIRD_DIR .. "physx/x86/include",
 				CROWN_THIRD_DIR .. "physx/x86/include/common",
@@ -334,8 +318,7 @@ solution "crown"
 				CROWN_THIRD_DIR .. "stb_vorbis"
 			}
 
-			libdirs
-			{
+			libdirs {
 				CROWN_THIRD_DIR .. "luajit/x86/lib",
 				CROWN_THIRD_DIR .. "physx/x86/lib"
 			}
@@ -346,7 +329,7 @@ solution "crown"
 				"cp -r " .. CROWN_THIRD_DIR .. "/luajit/x86/share/luajit-2.0.3/jit " .. CROWN_INSTALL_DIR .. "bin/linux32/"
 			}
 
-		configuration { "x64", "linux-*" }
+		configuration { "linux-*", "x64" }
 			targetdir(CROWN_INSTALL_DIR .. "bin/linux64")
 
 			includedirs {
@@ -375,8 +358,7 @@ solution "crown"
 				CROWN_THIRD_DIR .. "stb_vorbis",
 			}
 
-			libdirs
-			{
+			libdirs {
 				CROWN_THIRD_DIR .. "luajit/x86_64/lib",
 				CROWN_THIRD_DIR .. "physx/x86_64/lib",
 			}
@@ -398,8 +380,7 @@ solution "crown"
 
 			defines { "__STDC_FORMAT_MACROS" }
 
-			buildoptions
-			{
+			buildoptions {
 				"--sysroot=$(ANDROID_NDK_ROOT)/platforms/android-14/arch-arm",
 				"-ffunction-sections",
 				"-fPIC",
@@ -415,8 +396,7 @@ solution "crown"
 				"-Wa,--noexecstack",
 			}
 			
-			linkoptions
-			{
+			linkoptions {
 				"-shared",
 				"-nostdlib",
 				"-static-libgcc",
@@ -432,8 +412,7 @@ solution "crown"
 				"-Wl,--fix-cortex-a8",
 			}
 
-			links
-			{
+			links {
 				":libluajit-5.1.a",
 				"android",
 				"c",
@@ -478,16 +457,14 @@ solution "crown"
 				"$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/include"
 			}
 
-			libdirs
-			{
+			libdirs {
 				CROWN_THIRD_DIR .. "luajit/android/lib",
 				CROWN_THIRD_DIR .. "physx/android/lib",
 				"$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a",
 				"$(ANDROID_NDK_ROOT)/platforms/android-14/arch-arm/usr/lib"
 			}
 
-			excludes
-			{
+			excludes {
 				CROWN_SOURCE_DIR .. "engine/os/linux/*",
 				CROWN_SOURCE_DIR .. "engine/os/win/*",
 				CROWN_SOURCE_DIR .. "engine/renderers/backend/gl/glx/*",
@@ -515,8 +492,7 @@ solution "crown"
 			-- 	"	SimulationControllerCHECKED" ..
 			-- 	") -Wl,--end-group"
 			-- }
-			linkoptions
-			{ 
+			linkoptions { 
 				"-Wl,--start-group $(addprefix -l," ..
 				"	LowLevelCloth" ..
 				"	PhysX3 " ..
@@ -554,8 +530,7 @@ solution "crown"
 			-- 	"	SimulationControllerPROFILE" ..
 			-- 	") -Wl,--end-group"
 			-- }
-			linkoptions
-			{ 
+			linkoptions { 
 				"-Wl,--start-group $(addprefix -l," ..
 				"	LowLevelCloth" ..
 				"	PhysX3 " ..
@@ -574,8 +549,7 @@ solution "crown"
 				") -Wl,--end-group"
 			}	
 		configuration { "release", "android"}
-			linkoptions
-			{ 
+			linkoptions { 
 				"-Wl,--start-group $(addprefix -l," ..
 				"	LowLevelCloth" ..
 				"	PhysX3 " ..
@@ -594,9 +568,7 @@ solution "crown"
 				") -Wl,--end-group"
 			}
 
-
 		-- it's necessary to define DXSDK_DIR env variable to DirectX sdk directory
-
 		configuration { "vs*" }
 			kind "ConsoleApp"
 
@@ -625,8 +597,7 @@ solution "crown"
 				"/Oy-", -- Suppresses creation of frame pointers on the call stack.
 				"/Ob2", -- The Inline Function Expansion
 			}
-			links
-			{
+			links {
 				"OpenGL32",
 				"lua51",
 				"OpenAL32"
@@ -636,13 +607,11 @@ solution "crown"
 				CROWN_SOURCE_DIR .. "/engine/renderers/backend/gl/wgl"
 			}
 
-			libdirs
-			{
+			libdirs {
 				CROWN_THIRD_DIR .. "openal/lib"
 			}
 
-			excludes
-			{
+			excludes {
 				CROWN_SOURCE_DIR .. "engine/os/android/*",
 				CROWN_SOURCE_DIR .. "engine/os/linux/*",
 				CROWN_SOURCE_DIR .. "engine/os/posix/*",
@@ -658,8 +627,7 @@ solution "crown"
 			}
 
 		configuration { "vs*", "debug" }
-			links
-			{
+			links {
 				"PhysX3ExtensionsCHECKED",
 				"PhysXProfileSDKCHECKED",
 				"PhysXVisualDebuggerSDKCHECKED",
@@ -667,8 +635,7 @@ solution "crown"
 			}
 
 		configuration { "vs*", "development" }
-			links
-			{
+			links {
 				"PhysX3ExtensionsPROFILE",
 				"PhysXProfileSDKPROFILE",
 				"PhysXVisualDebuggerSDKPROFILE",
@@ -676,8 +643,7 @@ solution "crown"
 			}
 
 		configuration { "vs*", "release" }
-			links
-			{
+			links {
 				"PhysX3Extensions",
 				"PhysXProfileSDK",
 				"PhysXVisualDebuggerSDK",
@@ -710,8 +676,8 @@ solution "crown"
 				CROWN_THIRD_DIR .. "stb_image",
 				CROWN_THIRD_DIR .. "stb_vorbis"
 			}
-			libdirs
-			{
+
+			libdirs {
 				CROWN_THIRD_DIR .. "luajit/win32/lib",
 				CROWN_THIRD_DIR .. "physx/win32/lib"
 			}
@@ -797,20 +763,3 @@ solution "crown"
 				"PhysX3Common_x64",
 				"PhysX3Cooking_x64"
 			}
-
-
-	-- os.copyfile(CROWN_THIRD_DIR .. "luajit/x86/lib/libluajit-5.1.so.2.0.3", CROWN_INSTALL_DIR .. "bin/linux32/")
-	-- os.copyfile(CROWN_THIRD_DIR .. "luajit/x86/lib/libluajit-5.1.so.2", CROWN_INSTALL_DIR .. "bin/linux32/")
-	-- os.mkdir(CROWN_INSTALL_DIR .. "bin/linux32/jit")
-	-- os.copyfile(CROWN_THIRD_DIR .. "/luajit/x86/share/luajit-2.0.3/jit/*", CROWN_INSTALL_DIR .. "bin/linux32/jit/")
-
-	-- os.copyfile(CROWN_THIRD_DIR .. "luajit/x86_64/bin/luajit-2.0.3", CROWN_INSTALL_DIR .. "bin/linux64/")
-	-- os.copyfile(CROWN_THIRD_DIR .. "luajit/x86_64/bin/luajit", CROWN_INSTALL_DIR .. "bin/linux64/")
-	-- os.copyfile(CROWN_THIRD_DIR .. "luajit/x86_64/lib/libluajit-5.1.so.2.0.3", CROWN_INSTALL_DIR .. "bin/linux64/")
-	-- os.copyfile(CROWN_THIRD_DIR .. "luajit/x86_64/lib/libluajit-5.1.so.2", CROWN_INSTALL_DIR .. "bin/linux64/")
-	-- os.mkdir(CROWN_INSTALL_DIR .. "bin/linux64/jit")
-	-- os.copyfile(CROWN_THIRD_DIR .. "/luajit/x86_64/share/luajit-2.0.3/jit/*", CROWN_INSTALL_DIR .. "bin/linux64/jit/")
-
-	-- os.copyfile(CROWN_THIRD_DIR .. "luajit/android/lib/libluajit-5.1.so.2.0.2", CROWN_INSTALL_DIR .. "bin/android/")
-	-- os.copyfile(CROWN_THIRD_DIR .. "luajit/android/lib/libluajit-5.1.so", CROWN_INSTALL_DIR .. "bin/android/")
-