Making dependencies work again with dynamic (due to prefix) namesremove_obsolete

3 files changed, 21 insertions, 17 deletions

diff --git a/3rdparty/lua/premake4.lua b/3rdparty/lua/premake4.lua
index 7dacd2a..327aec6 100644
--- a/3rdparty/lua/premake4.lua
+++ b/3rdparty/lua/premake4.lua
@@ -140,7 +140,7 @@ function create_luajit_projects(basedir, pfx)
         objdir              (int_dir)

         libdirs             {"$(IntDir)"}

         defines             {"NDEBUG", "_CRT_SECURE_NO_DEPRECATE"}

-        links               ("minilua") -- make sure we have minilua.exe

+        links               (pfx.."minilua") -- make sure we have minilua.exe

         vpaths              {["Header Files/*"] = { bd.."src/host/*.h" }, ["Source Files/*"] = { bd.."src/host/*.c" },}

         files               {bd.."src/host/buildvm*.c", bd.."src/host/buildvm*.h",}

         -- Add the pre-build steps required to compile and link the static library

@@ -163,7 +163,7 @@ function create_luajit_projects(basedir, pfx)
         objdir              (int_dir)

         libdirs             {"$(IntDir)"}

         defines             {"NDEBUG", "_CRT_SECURE_NO_DEPRECATE"}

-        links               {"minilua", "buildvm"} -- make sure we have minilua.exe

+        links               {pfx.."minilua", pfx.."buildvm"} -- make sure we have minilua.exe

         linkoptions         {"/nodefaultlib"}

         vpaths              {["Header Files/*"] = { bd.."src/*.h" }, ["Source Files/*"] = { bd.."src/*.c" },}

         files               {bd.."src/lib_*.c", bd.."src/lj_*.c", bd.."src/*.h",}

@@ -194,7 +194,7 @@ function create_luajit_projects(basedir, pfx)
             objdir              (int_dir)

             libdirs             {"$(IntDir)"}

             defines             {"NDEBUG", "_CRT_SECURE_NO_DEPRECATE"}

-            links               {"luajit2"}

+            links               {pfx.."luajit2"}

             linkoptions         {"/pdbaltpath:%_PDB%"}

             vpaths              {["Header Files/*"] = { bd.."src/*.h" }, ["Source Files/*"] = { bd.."src/*.c" },}

             files               {bd.."src/luajit.c",}

diff --git a/premake4.lua b/premake4.lua
index 984ff36..90527de 100644
--- a/premake4.lua
+++ b/premake4.lua
@@ -99,10 +99,6 @@ local function transformMN(input) -- transform the macro names for older Visual
     end

     return input

 end

-local function inc(inc_dir)

-    include(inc_dir)

-    create_luajit_projects(inc_dir, "wds_release_")

-end

 newoption { trigger = "resources", description = "Also create projects for the resource DLLs." }

 newoption { trigger = "sdk71", description = "Applies to VS 2005 and 2008. If you have the Windows 7 SP1\n                   SDK, use this to create projects for a feature-complete\n                   WinDirStat." }

 newoption { trigger = "release", description = "Creates a solution suitable for a release build." }

@@ -110,14 +106,19 @@ if _OPTIONS["resources"] then
     print "INFO: Creating projects for resource DLLs."

 end

 local release = false

+local slnname = "wds_release"

 if _OPTIONS["release"] then

     print "INFO: Creating release build solution."

     _OPTIONS["resources"] = ""

     _OPTIONS["sdk71"] = ""

     release = true

 end

+local function inc(inc_dir)

+    include(inc_dir)

+    create_luajit_projects(inc_dir, iif(release, slnname .. "_", ""))

+end

 

-solution (iif(release, "wds_release", "windirstat"))

+solution (iif(release, slnname, "windirstat"))

     configurations  (iif(release, {"Release"}, {"Debug", "Release"}))

     platforms       {"x32", "x64"}

     location        ('.')

@@ -126,7 +127,7 @@ solution (iif(release, "wds_release", "windirstat"))
     inc("3rdparty\\lua")

 

     -- Main WinDirStat project

-    project (iif(release, "wds_release", "windirstat"))

+    project (iif(release, slnname, "windirstat"))

         local int_dir   = "intermediate/" .. action .. "_$(" .. transformMN("Platform") .. ")_$(" .. transformMN("Configuration") .. ")\\$(ProjectName)"

         uuid            ("BD11B94C-6594-4477-9FDF-2E24447D1F14")

         language        ("C++")

@@ -138,12 +139,16 @@ solution (iif(release, "wds_release", "windirstat"))
         includedirs     {".", "windirstat", "common", "windirstat/Controls", "windirstat/Dialogs", "3rdparty/lua/src"}

         objdir          (int_dir)

         libdirs         {"$(IntDir)"}

-        links           {"htmlhelp", "psapi", "delayimp"}

+        links           {"htmlhelp", "psapi", "delayimp", iif(release, slnname .. "_luajit2", "luajit2")}

         resoptions      {"/nologo", "/l409"}

         resincludedirs  {".", "$(IntDir)"}

         linkoptions     {"/delayload:psapi.dll", "/pdbaltpath:%_PDB%"}

-        links           {"luajit2"}

-

+        if release then

+            postbuildcommands

+            {

+                "signtool.exe sign /v /a /ph /d \"WinDirStat\" /du \"http://windirstat.info\" /tr http://www.startssl.com/timestamp \"$(TargetPath)\""

+            }

+        end

         files

         {

             "common/*.h",

@@ -243,7 +248,7 @@ solution (iif(release, "wds_release", "windirstat"))
                 }

             for nm,guid in pairs(resource_dlls) do

                 premake.CurrentContainer = oldcurr

-                prj = project(iif(release, "wds_release_" .. nm, nm))

+                prj = project(iif(release, slnname .. "_" .. nm, nm))

                     local int_dir   = "intermediate/" .. action .. "_$(ProjectName)_" .. nm

                     uuid            (guid)

                     language        ("C++")

diff --git a/public_release.cmd b/public_release.cmd
index f6e2071..9c09c36 100644
--- a/public_release.cmd
+++ b/public_release.cmd
@@ -1,11 +1,10 @@
 @echo off
 setlocal ENABLEEXTENSIONS & pushd .
+"%~dp0common\premake4.exe" --release vs2005
 call %~dp0common\setvcvars.cmd 2005
 call %~dp0common\buildinc.cmd "%~dp0common"
 echo %VCVER_FRIENDLY%
-vcbuild.exe /time /rebuild /showenv /M4 /nologo ^
-    "/htmllog:$(SolutionDir)build\buildlog32.html" "%~dp0\windirstat.vs8.sln" "Release|Win32"
-vcbuild.exe /time /rebuild /showenv /M4 /nologo ^
-    "/htmllog:$(SolutionDir)build\buildlog64.html" "%~dp0\windirstat.vs8.sln" "Release|x64"
+vcbuild.exe /time /rebuild /showenv /M1 /nologo ^
+    "/htmllog:$(SolutionDir)build\buildlog.html" "%~dp0\wds_release.vs8.sln" "$ALL"
 popd & endlocal
 goto :EOF