diff options
author | Oliver Schneider <oliver@assarbad.net> | 2017-11-24 00:18:15 +0300 |
---|---|---|
committer | Oliver Schneider <oliver@assarbad.net> | 2017-11-24 00:18:15 +0300 |
commit | 76ed1ebfcd5ddc6c40bce6e193c4d8d49a35a61c (patch) | |
tree | 8ee7da777703095a7cc8b97acbb46d599b5be7ae /premake4.lua | |
parent | ea449d28c1582161a3007e8c168dd56b7ce867d3 (diff) |
Rearranged some build flags in premake4.lua
Fixed up produce_vsprojects.cmd to heed the command line arguments
Reverted to original RGB_GET_?VALUE macros to prevent an exception in debug builds
Removing more parts referring to the CHM help file
Removing WEAK_ASSERT
Using --full to produce the checked in solutions
Fixed constant length to account for terminating zero
Diffstat (limited to 'premake4.lua')
-rw-r--r-- | premake4.lua | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/premake4.lua b/premake4.lua index 3010bd8..9bb3220 100644 --- a/premake4.lua +++ b/premake4.lua @@ -368,8 +368,8 @@ solution (iif(release, slnname, "windirstat")) kind ("WindowedApp")
location ("windirstat")
targetname ("wds")
- flags {"StaticRuntime", "Unicode", "MFC", "NativeWChar", "ExtraWarnings", "NoRTTI", "WinMain", "NoMinimalRebuild", "NoIncrementalLink", "NoEditAndContinue"}
- targetdir (iif(release, slnname, "build"))
+ flags {"StaticRuntime", "Unicode", "MFC", "NativeWChar", "ExtraWarnings", "NoRTTI", "WinMain",}
+ targetdir (iif(release, slnname, iif(action == "vs2005", "build", "build." .. action)))
includedirs {".", "windirstat", "common", "windirstat/Controls", "windirstat/Dialogs", "3rdparty/lua/src"}
objdir (int_dir)
links {"psapi", "delayimp", pfx.."luajit2"}
@@ -444,11 +444,11 @@ solution (iif(release, slnname, "windirstat")) configuration {"Debug"}
defines {"_DEBUG", "VTRACE_TO_CONSOLE=1", "VTRACE_DETAIL=2"}
flags {"Symbols"}
- linkoptions {"/nodefaultlib:libcmt"}
+ linkoptions {"/nodefaultlib:libcmt",}
configuration {"Release"}
defines ("NDEBUG")
- flags {"Optimize", "Symbols"}
+ flags {"Optimize", "Symbols", "NoMinimalRebuild", "NoIncrementalLink", "NoEditAndContinue"}
linkoptions {"/release"}
buildoptions {"/Oi", "/Ot"}
@@ -475,7 +475,7 @@ solution (iif(release, slnname, "windirstat")) location ("sandbox/luaconf")
targetname ("luaconf")
flags {"StaticRuntime", "Unicode", "MFC", "NativeWChar", "ExtraWarnings", "NoRTTI", "WinMain", "NoMinimalRebuild", "NoIncrementalLink", "NoEditAndContinue"}
- targetdir (iif(release, slnname, "build"))
+ targetdir (iif(release, slnname, iif(action == "vs2005", "build", "build." .. action)))
includedirs {"windirstat", "common", "3rdparty/lua/src", "sandbox/luaconf"}
objdir (int_dir)
libdirs {"$(IntDir)"}
@@ -562,7 +562,7 @@ solution (iif(release, slnname, "windirstat")) location (nmdir)
flags {"NoImportLib", "Unicode", "NoManifest", "NoExceptions", "NoPCH", "NoIncrementalLink"}
objdir (int_dir)
- targetdir (iif(release, slnname, "build"))
+ targetdir (iif(release, slnname, iif(action == "vs2005", "build", "build." .. action)))
targetname ("wdsr" .. nmpfx)
targetextension (".wdslng")
resdefines {"WDS_RESLANG=0x" .. nmpfx, "MODNAME=wdsr" .. nmpfx}
|