Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle current directory with MSVS 2017 in a better way

Browse Source 
Set VSCMD_START_DIR to "%CD%" to prevent MSVS 2017 build scripts from
changing the directory.

See #18075.
This commit is contained in:
Danny Scott
2018-02-02 18:17:41 +01:00
committed by Vadim Zeitlin
parent 94e201df78
commit cf588d7a64
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build/tools/msvs/officialbuild.bat
View File

@@ -9,9 +9,7 @@ cd ..\..\msw
rem VS2017 changes the build directory when environment batch files rem VS2017 changes the build directory when environment batch files
rem are called, so remember where we are building from. rem are called, so remember where we are building from.
set build_dir=%cd% set "VSCMD_START_DIR=%CD%"
del ..\..\include\wx\msw\setup.h
rem ================ wxWidgets Official Build =============== rem ================ wxWidgets Official Build ===============
rem rem
@@ -29,7 +27,6 @@ if "%1" == "vc141" (
set comp=141 set comp=141
set compvers=vc141 set compvers=vc141
call "%VS150COMNTOOLS%VsDevCmd.bat" call "%VS150COMNTOOLS%VsDevCmd.bat"
cd %build_dir%
) )
if "%1" == "vc140" ( if "%1" == "vc140" (
@echo Building for vc140 / vs2015 @echo Building for vc140 / vs2015
@@ -95,8 +92,6 @@ if "%compvers%" == "vc110" call "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" x86_amd
if "%compvers%" == "vc100" call "%WINDOWS71SDK%SetEnv.Cmd" /X64 /Release if "%compvers%" == "vc100" call "%WINDOWS71SDK%SetEnv.Cmd" /X64 /Release
if "%compvers%" == "vc90" call "%WINDOWS61SDK%SetEnv.Cmd" /X64 /Release if "%compvers%" == "vc90" call "%WINDOWS61SDK%SetEnv.Cmd" /X64 /Release
cd %build_dir%
@echo 64 bit release build @echo 64 bit release build
nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> %compvers%x64_Release.txt nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> %compvers%x64_Release.txt
@@ -119,8 +114,6 @@ if "%compvers%" == "vc110" call "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" x86
if "%compvers%" == "vc100" call "%WINDOWS71SDK%SetEnv.Cmd" /X86 /Release if "%compvers%" == "vc100" call "%WINDOWS71SDK%SetEnv.Cmd" /X86 /Release
if "%compvers%" == "vc90" call "%WINDOWS61SDK%SetEnv.Cmd" /X86 /Release if "%compvers%" == "vc90" call "%WINDOWS61SDK%SetEnv.Cmd" /X86 /Release
cd %build_dir%
@echo 32 bit release build @echo 32 bit release build
nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 CPPFLAGS=/arch:SSE CFLAGS=/arch:SSE >> %compvers%x86_Release.txt nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 CPPFLAGS=/arch:SSE CFLAGS=/arch:SSE >> %compvers%x86_Release.txt