From 7da7e1493e1dd1cdf672582dee4160606d7b6cdf Mon Sep 17 00:00:00 2001 From: Sebastien Vincent Date: Thu, 10 Aug 2017 10:08:00 +0200 Subject: [PATCH] Fixes Debug build on Windows and adds additionnals target to Windows Makefile. --- Makefile.windows | 37 ++++++++++++++++++++++++++++++------ apps/freelan/freelan.vcxproj | 8 ++++---- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/Makefile.windows b/Makefile.windows index 5376abd1..0de84281 100644 --- a/Makefile.windows +++ b/Makefile.windows @@ -4,18 +4,43 @@ default: build -build: build_x64 build_x86 +build: build_release_x64 build_release_x86 -clean: clean_x64 clean_x86 +build_debug: build_debug_x64 build_debug_x86 -build_x64: +clean: clean_release_x64 clean_release_x86 + +clean_debug: clean_debug_x64 clean_debug_x86 + +# short aliases for build/clean release targets +build_x64: build_release_x64 + +build_x86: build_release_x86 + +clean_x64: clean_release_x64 + +clean_x86: clean_release_x86 + +build_release_x64: msbuild freelan-all.sln /p:Configuration=Release /p:Platform=x64 /t:Build -build_x86: +build_debug_x64: + msbuild freelan-all.sln /p:Configuration=Debug /p:Platform=x64 /t:Build + +build_release_x86: msbuild freelan-all.sln /p:Configuration=Release /p:Platform=Win32 /t:Build -clean_x64: +build_debug_x86: + msbuild freelan-all.sln /p:Configuration=Debug /p:Platform=Win32 /t:Build + +clean_release_x64: msbuild freelan-all.sln /p:Configuration=Release /p:Platform=x64 /t:Clean -clean_x86: +clean_debug_x64: + msbuild freelan-all.sln /p:Configuration=Debug /p:Platform=x64 /t:Clean + +clean_release_x86: msbuild freelan-all.sln /p:Configuration=Release /p:Platform=Win32 /t:Clean + +clean_debug_x86: + msbuild freelan-all.sln /p:Configuration=Debug /p:Platform=Win32 /t:Clean diff --git a/apps/freelan/freelan.vcxproj b/apps/freelan/freelan.vcxproj index 3d62693f..a0d0c59e 100644 --- a/apps/freelan/freelan.vcxproj +++ b/apps/freelan/freelan.vcxproj @@ -88,7 +88,7 @@ $(SolutionDir)\third-party\install\$(PlatformShortName)\$(Configuration)\include;$(SolutionDir)\third-party\install\$(PlatformShortName)\$(Configuration)\include\boost-1_64;$(SolutionDir)\libs\asiotap\include;$(SolutionDir)\libs\cryptoplus\include;$(SolutionDir)\libs\executeplus\include;$(SolutionDir)\libs\freelan\include;$(SolutionDir)\libs\fscp\include;$(SolutionDir)\libs\iconvplus\include;$(SolutionDir)\libs\kfather\include;$(SolutionDir)\libs\mongooseplus\include;$(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include;$(IncludePath) $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\apps\$(ProjectName)\ $(SolutionDir)\install\$(PlatformShortName)\$(Configuration)\bin\ - $(SolutionDir)\third-party\install\$(PlatformShortName)\$(Configuration)\lib;$(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); + $(SolutionDir)\third-party\install\$(PlatformShortName)\$(Configuration)\lib;$(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);$(VC_LibraryPath_x86) ClCompile $(ProjectName) @@ -97,7 +97,7 @@ $(SolutionDir)\third-party\install\$(PlatformShortName)\$(Configuration)\include;$(SolutionDir)\third-party\install\$(PlatformShortName)\$(Configuration)\include\boost-1_64;$(SolutionDir)\libs\asiotap\include;$(SolutionDir)\libs\cryptoplus\include;$(SolutionDir)\libs\executeplus\include;$(SolutionDir)\libs\freelan\include;$(SolutionDir)\libs\fscp\include;$(SolutionDir)\libs\iconvplus\include;$(SolutionDir)\libs\kfather\include;$(SolutionDir)\libs\mongooseplus\include;$(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include;$(IncludePath) $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\apps\$(ProjectName)\ $(SolutionDir)\install\$(PlatformShortName)\$(Configuration)\bin\ - $(SolutionDir)\third-party\install\$(PlatformShortName)\$(Configuration)\lib;$(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\lib;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + $(SolutionDir)\third-party\install\$(PlatformShortName)\$(Configuration)\lib;$(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\lib;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64);$(VC_LibraryPath_x64) ClCompile $(ProjectName) @@ -106,7 +106,7 @@ $(SolutionDir)\third-party\install\$(PlatformShortName)\$(Configuration)\include;$(SolutionDir)\third-party\install\$(PlatformShortName)\$(Configuration)\include\boost-1_64;$(SolutionDir)\libs\asiotap\include;$(SolutionDir)\libs\cryptoplus\include;$(SolutionDir)\libs\executeplus\include;$(SolutionDir)\libs\freelan\include;$(SolutionDir)\libs\fscp\include;$(SolutionDir)\libs\iconvplus\include;$(SolutionDir)\libs\kfather\include;$(SolutionDir)\libs\mongooseplus\include;$(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include;$(IncludePath) $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\apps\$(ProjectName)\ $(SolutionDir)\install\$(PlatformShortName)\$(Configuration)\bin\ - $(SolutionDir)\third-party\install\$(PlatformShortName)\$(Configuration)\lib;$(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); + $(SolutionDir)\third-party\install\$(PlatformShortName)\$(Configuration)\lib;$(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);$(VC_LibraryPath_x86) ClCompile $(ProjectName) @@ -282,4 +282,4 @@ xcopy /E /Y $(SolutionDir)\third-party\install\$(PlatformShortName)\$(Configurat - + \ No newline at end of file