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

Pass CPPFLAGS to cpp when generating rcdefs.h

Browse Source 
Honour user-defined CPPFLAGS when creating rcdefs.h, this notably fixes
generating the file with wrong architecture when cross-compiling from 64
to 32 bits with CPPFLAGS=-m32.

Closes #17844.
This commit is contained in:
flederwiesel
2020-02-02 00:13:55 +01:00
committed by Vadim Zeitlin
parent 55efc9e607
commit 0073b54f8e
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/bakefiles/wx.bkl
View File

@@ -205,7 +205,7 @@
<depends-on-file>$(SRCDIR)/include/wx/msw/genrcdefs.h</depends-on-file> <depends-on-file>$(SRCDIR)/include/wx/msw/genrcdefs.h</depends-on-file>
<command> <command>
$(DOLLAR)(CPP) "$(nativePaths(SRCDIR))\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h" $(DOLLAR)(CPP) $(DOLLAR)(CPPFLAGS) "$(nativePaths(SRCDIR))\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
</command> </command>
</action> </action>

2
build/msw/makefile.bcc
View File

@@ -5580,7 +5580,7 @@ $(SETUPHDIR)\wx\msw: $(SETUPHDIR)\wx
if not exist $(SETUPHDIR)\wx\msw mkdir $(SETUPHDIR)\wx\msw if not exist $(SETUPHDIR)\wx\msw mkdir $(SETUPHDIR)\wx\msw
$(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs.h $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs.h
$(CPP) "..\..\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h" $(CPP) $(CPPFLAGS) "..\..\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
build_cfg_file: $(SETUPHDIR) build_cfg_file: $(SETUPHDIR)
@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)

2
build/msw/makefile.gcc
View File

@@ -5885,7 +5885,7 @@ $(SETUPHDIR)\wx\msw: $(SETUPHDIR)\wx
if not exist $(SETUPHDIR)\wx\msw mkdir $(SETUPHDIR)\wx\msw if not exist $(SETUPHDIR)\wx\msw mkdir $(SETUPHDIR)\wx\msw
$(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs.h $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs.h
$(CPP) "..\..\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h" $(CPP) $(CPPFLAGS) "..\..\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
build_cfg_file: $(SETUPHDIR) build_cfg_file: $(SETUPHDIR)
@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)

2
build/msw/makefile.vc
View File

@@ -6331,7 +6331,7 @@ $(SETUPHDIR)\wx\msw: $(SETUPHDIR)\wx
if not exist $(SETUPHDIR)\wx\msw mkdir $(SETUPHDIR)\wx\msw if not exist $(SETUPHDIR)\wx\msw mkdir $(SETUPHDIR)\wx\msw
$(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs.h $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs.h
$(CPP) "..\..\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h" $(CPP) $(CPPFLAGS) "..\..\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
build_cfg_file: $(SETUPHDIR) build_cfg_file: $(SETUPHDIR)
@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)