Skip to content

Commit 7b540b7

Browse files
committed
Updated to use latest wxWidgets.
1 parent fcb8d37 commit 7b540b7

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

.cproject

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,12 @@
525525
<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.release.1579099443." name="/" resourcePath="">
526526
<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.release.978223463" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.release">
527527
<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.release.21513118" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.release"/>
528-
<builder buildPath="${workspace_loc:/keeperfx_launchwx}" command="mingw32-make" id="cdt.managedbuild.target.gnu.builder.base.165780325" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
528+
<builder buildPath="${workspace_loc:/keeperfx_launchwx}" command="mingw32-make" id="cdt.managedbuild.target.gnu.builder.base.165780325" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base">
529+
<outputEntries>
530+
<entry flags="VALUE_WORKSPACE_PATH" kind="outputPath" name="bin"/>
531+
<entry flags="VALUE_WORKSPACE_PATH" kind="outputPath" name="obj"/>
532+
</outputEntries>
533+
</builder>
529534
<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.release.2046438023" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.release">
530535
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1503649964" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
531536
</tool>

.project

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
1010
<triggers>clean,full,incremental,</triggers>
1111
<arguments>
12+
<dictionary>
13+
<key>?children?</key>
14+
<value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
15+
</dictionary>
1216
<dictionary>
1317
<key>?name?</key>
1418
<value></value>

Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,21 @@ ifeq ($(UNICODE),1)
6363
WXUNICODEFLAG = u
6464
endif
6565
__WXLIB_CORE_p = \
66-
-lwx_msw$(WXUNICODEFLAG)_core-$(WX_RELEASE)$(HOST_SUFFIX)
66+
-lwxmsw$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)_core
6767
__WXLIB_BASE_p = \
68-
-lwx_base$(WXUNICODEFLAG)-$(WX_RELEASE)$(HOST_SUFFIX)
68+
-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)
6969
__LIB_TIFF_p = \
70-
-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
70+
-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
7171
__LIB_JPEG_p = \
72-
-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
72+
-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
7373
__LIB_PNG_p = \
74-
-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
74+
-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
7575
__LIB_ZLIB_p = \
76-
-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
76+
-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
7777
___LIB_REGEX_p = \
78-
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
78+
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
7979
___LIB_EXPAT_p = \
80-
-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
80+
-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
8181

8282
.PHONY: all all-before all-after debug docs docsdox clean clean-custom
8383

0 commit comments

Comments
 (0)