solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Ensure that include paths to 3rd party libraries come first

Browse source 
Rearrange wx_{lib,dll} templates definitions to put 3rd party include
paths in the beginning, before WX_CPPFLAGS inherited from wx_{lib,dll}_b
template, so that our own 3rd party libraries headers are found before
the system ones, if we're using built-in versions of the libraries.
This commit is contained in:
Vadim Zeitlin 2020-02-05 03:28:59 +01:00
parent 1250eac850
commit 7db9b707b2
53 changed files with 1921 additions and 1915 deletions
Download patch file Download diff file Expand all files Collapse all files

8
build/bakefiles/common.bkl
View file

@ -759,17 +759,17 @@ $(TAB)cl /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
</template>
<template id="wx_lib"
template="wx_lib_b,wx_3rdparty_includes_gui,msvc_setup_h"/>
template="wx_3rdparty_includes_gui,wx_lib_b,msvc_setup_h"/>
<template id="wx_base_lib"
template="wx_lib_b,wx_3rdparty_includes_base,msvc_setup_h">
template="wx_3rdparty_includes_base,wx_lib_b,msvc_setup_h">
<define>wxUSE_GUI=0</define>
</template>
<template id="wx_dll"
template="wx_dll_b,wx_3rdparty_dependencies_gui,wx_3rdparty_includes_gui"
template="wx_3rdparty_includes_gui,wx_dll_b,wx_3rdparty_dependencies_gui"
template_append="msvc_setup_h,wx_append_nomono"/>
<template id="wx_base_dll"
template="wx_dll_b,wx_3rdparty_dependencies_base,wx_3rdparty_includes_base"
template="wx_3rdparty_includes_base,wx_dll_b,wx_3rdparty_dependencies_base"
template_append="msvc_setup_h,wx_append_base_nomono">
<define>wxUSE_GUI=0</define>
</template>