Skip to content

Commit

Permalink
Fixes Debug build on Windows and adds additionnals target to Windows …
Browse files Browse the repository at this point in the history
…Makefile.
  • Loading branch information
s-vincent committed Aug 10, 2017
1 parent 0ce9d9e commit 7da7e14
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 10 deletions.
37 changes: 31 additions & 6 deletions Makefile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions apps/freelan/freelan.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<IncludePath>$(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)</IncludePath>
<IntDir>$(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\apps\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)\install\$(PlatformShortName)\$(Configuration)\bin\</OutDir>
<LibraryPath>$(SolutionDir)\third-party\install\$(PlatformShortName)\$(Configuration)\lib;$(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);</LibraryPath>
<LibraryPath>$(SolutionDir)\third-party\install\$(PlatformShortName)\$(Configuration)\lib;$(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);$(VC_LibraryPath_x86)</LibraryPath>
<CustomBuildBeforeTargets>ClCompile</CustomBuildBeforeTargets>
<TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
Expand All @@ -97,7 +97,7 @@
<IncludePath>$(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)</IncludePath>
<IntDir>$(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\apps\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)\install\$(PlatformShortName)\$(Configuration)\bin\</OutDir>
<LibraryPath>$(SolutionDir)\third-party\install\$(PlatformShortName)\$(Configuration)\lib;$(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\lib;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64);</LibraryPath>
<LibraryPath>$(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)</LibraryPath>
<CustomBuildBeforeTargets>ClCompile</CustomBuildBeforeTargets>
<TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
Expand All @@ -106,7 +106,7 @@
<IncludePath>$(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)</IncludePath>
<IntDir>$(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\apps\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)\install\$(PlatformShortName)\$(Configuration)\bin\</OutDir>
<LibraryPath>$(SolutionDir)\third-party\install\$(PlatformShortName)\$(Configuration)\lib;$(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);</LibraryPath>
<LibraryPath>$(SolutionDir)\third-party\install\$(PlatformShortName)\$(Configuration)\lib;$(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);$(VC_LibraryPath_x86)</LibraryPath>
<CustomBuildBeforeTargets>ClCompile</CustomBuildBeforeTargets>
<TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
Expand Down Expand Up @@ -282,4 +282,4 @@ xcopy /E /Y $(SolutionDir)\third-party\install\$(PlatformShortName)\$(Configurat
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

0 comments on commit 7da7e14

Please sign in to comment.