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

Merge branch 'dos_BuildTools' of https://github.com/doscott/wxWidgets

Browse Source 
Official build/packaging scripts fixes: specify TARGET_CPU explicitly
for 32 bit builds (and also document it); don't bother modifying
wxwidgets.props as it now works out of the box.

See https://github.com/wxWidgets/wxWidgets/pull/1960
This commit is contained in:
Vadim Zeitlin
2020-07-13 20:54:27 +02:00
parent 87d2f35f37 5ed09da80c
commit 3ec166f960
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,7 +124,7 @@ if "%compvers%" == "vc90" call "%WINDOWS61SDK%SetEnv.Cmd" /X86 /Release
@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 TARGET_CPU=X86 >> %compvers%x86_Release.txt
if ERRORLEVEL 1 goto ERR_BUILD
@@ -132,7 +132,7 @@ cd ..\..\utils\wxrc
rmdir %compvers%_mswuddll /s /q
del %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
nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 CPPFLAGS=/arch:SSE CFLAGS=/arch:SSE TARGET_CPU=X86 >> %compvers%x86_Release.txt
cd %build_dir%
@@ -143,7 +143,7 @@ if ERRORLEVEL 1 goto ERR_BUILD
if "%compvers%" == "vc100" call "%WINDOWS71SDK%SetEnv.Cmd" /X86 /Debug
if "%compvers%" == "vc90" call "%WINDOWS61SDK%SetEnv.Cmd" /X86 /Debug
nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 CPPFLAGS=/arch:SSE CFLAGS=/arch:SSE >> %compvers%x86_Debug.txt
nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 CPPFLAGS=/arch:SSE CFLAGS=/arch:SSE TARGET_CPU=X86 >> %compvers%x86_Debug.txt
if ERRORLEVEL 1 goto ERR_BUILD

10
build/tools/msvs/package.bat
View File

@@ -79,22 +79,20 @@ rem included from it.
7z a -t7z %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_Dev.7z build\msw\wx_setup.props
7z a -t7z %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_Dev.7z build\msw\wx_setup.props
rem Create a modified copy of wxwidgets.props suitable for use with our
rem binaries: we need to enable automatic ABI-compatible MSVC version detection
rem for this, so we define it in the same place where WXUSINGDLL is defined (as
rem we only provide DLLs, this is sufficient).
powershell -noprofile -command "& { (Get-Content wxwidgets.props).Replace('WXUSINGDLL','WXUSINGDLL;wxMSVC_VERSION_ABI_COMPAT') | Set-Content %packagePath%\%VCver%\wxwidgets.props }"
copy wxwidgets.props %packagePath%\%VCver%\wxwidgets.props
rem Change to the directory containing wxwidgets.props in order to include it
rem into the archive without any path.
cd %packagePath%\%VCver%
7z a -t7z wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_Dev.7z wxwidgets.props
7z a -t7z wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_Dev.7z wxwidgets.props
del wxwidgets.props
del sha1.txt
fciv . -type *.7z -sha1 -wp >> sha1.txt
rem fciv requies a complete path to files
fciv %cd%\. -type *.7z -sha1 -wp >> sha1.txt
goto End

10
docs/msw/install.md
View File

@@ -84,11 +84,13 @@ Microsoft Visual C++ Compilation {#msw_build_msvs}
to build a release version or
> nmake /f makefile.vc BUILD=release SHARED=1
> nmake /f makefile.vc BUILD=release SHARED=1 TARGET_CPU=X86
to build a release DLL version. Finally, you can also add
`TARGET_CPU=X64` to nmake command line to build Win64 versions
(this only works if you are using a 64 bit compiler, of course).
to build a 32 bit release DLL version from an x86 command prompt, or
> nmake /f makefile.vc BUILD=release SHARED=1 TARGET_CPU=X64
to build a 64 bit release DLL version from an x64 command prompt.
See "Configuring the Build" for more information about the
additional parameters that can be specified on the command line.