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

Improve build instructions for wxGTK/MSW

Browse Source 
Extract the patch that needs to be applied from the documentation and move it
to a separate file.

Closes #17659.
This commit is contained in:
Kolya Kosenko
2016-09-13 12:59:00 +02:00
committed by Vadim Zeitlin
parent de1aff4117
commit b05ea5f8f4
2 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
docs/msw/gtk.txt
View File

@@ -14,26 +14,9 @@ Building steps:
and be able to build wxWidgets as described in docs/msw/install.txt and be able to build wxWidgets as described in docs/msw/install.txt
2. wxGTK/Win32 is disabled by default in wxWidgets, you need to enable it 2. wxGTK/Win32 is disabled by default in wxWidgets, you need to enable it
in bakefiles manually. TOOLKIT variable should not be a constantly MSW in bakefiles manually. Apply following patch manually or using Cygwin:
for required bakefile formats.
diff build/bakefiles/config.bkl build/bakefiles/config.bkl
--- build/bakefiles/config.bkl
+++ build/bakefiles/config.bkl
@@ -67,9 +67,9 @@
</if>
<!-- We must make TOOLKIT a constant under Windows -->
- <if cond="FORMAT in ['borland','mingw','msvc','watcom', 'msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
+ <!--if cond="FORMAT in ['borland','mingw','msvc','watcom', 'msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
<set var="TOOLKIT">MSW</set>
- </if>
+ </if-->
</if>
<!--
patch -p0 < docs/msw/gtkfix.patch
Regenerate required make/project files: Regenerate required make/project files:
cd build\bakefiles cd build\bakefiles

24
docs/msw/gtkfix.patch Normal file
View File

@@ -0,0 +1,24 @@
--- build/bakefiles/common.bkl
+++ build/bakefiles/common.bkl
@@ -423,6 +423,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
<if cond="IS_MSVC_PRJ">
<msvc-headers-setup-h>
msw/setup.h
+ gtk/setup.h
univ/setup.h
</msvc-headers-setup-h>
<set var="_custom_build_include_wx_msw_setup_h">
--- build/bakefiles/config.bkl
+++ build/bakefiles/config.bkl
@@ -64,11 +64,6 @@
</description>
</option>
</if>
-
- <!-- We must make TOOLKIT a constant under Windows -->
- <if cond="FORMAT in ['borland','mingw','msvc','watcom', 'msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
- <set var="TOOLKIT">MSW</set>
- </if>
</if>
<!--