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

Resolve change log conflict with master

Browse Source 
Reapply the change log change manually to master version of the file to
let the CI builds merge this branch automatically.
This commit is contained in:
Vadim Zeitlin
2018-12-20 02:22:30 +01:00
parent c922c95c96 c6d3b9c0b9
commit b2cdd287bb
274 changed files with 2342 additions and 1378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/msw/makefile.gcc
View File

@@ -32,7 +32,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
WINDRES="$(WINDRES)"
CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 31
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
COMPILER_PREFIX = gcc
OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
@@ -5753,7 +5753,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
build_cfg_file: $(SETUPHDIR)
@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)
@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)