From: Václav Slavík Date: Tue, 7 Oct 2003 21:37:54 +0000 (+0000) Subject: fixed bakefile so that in-tree headers take precedence over system-installed ones X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e1a098d1ec2463d86e1a3a708d90e864ed17cdbb fixed bakefile so that in-tree headers take precedence over system-installed ones git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index a518a8b22b..af96be55d8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -53,11 +53,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ADVDLL_CXXFLAGS = $(__advdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ - $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_ADV $(CXXFLAGS) \ - $(PIC_FLAG) +ADVDLL_CXXFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_ADV $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) ADVDLL_OBJECTS = \ advdll_calctrl.o \ advdll_dcbuffer.o \ @@ -71,10 +70,10 @@ ADVDLL_OBJECTS = \ advdll_tipdlg.o \ advdll_wizard.o \ $(__ADVANCED_PLATFORM_SRC_OBJECTS_2) -ADVLIB_CXXFLAGS = $(__advlib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ - $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXFLAGS) +ADVLIB_CXXFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + $(CPPFLAGS) $(CXXFLAGS) ADVLIB_OBJECTS = \ advlib_calctrl.o \ advlib_dcbuffer.o \ @@ -323,16 +322,16 @@ ALL_BASE_SOURCES = \ ALL_HEADERS = \ $(ALL_BASE_HEADERS) \ $(ALL_GUI_HEADERS) -BASEDLL_CFLAGS = $(__basedll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ - $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE \ - -DwxUSE_BASE=1 $(CFLAGS) $(PIC_FLAG) -BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +BASEDLL_CFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) $(CPPFLAGS) \ + $(CFLAGS) +BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE \ - -DwxUSE_BASE=1 $(CXXFLAGS) $(PIC_FLAG) + -DwxUSE_BASE=1 $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) BASEDLL_OBJECTS = \ basedll_appbase.o \ basedll_clntdata.o \ @@ -394,14 +393,15 @@ BASEDLL_OBJECTS = \ basedll_utilscmn.o \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2) \ $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2) -BASELIB_CFLAGS = $(__baselib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +BASELIB_CFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) +BASELIB_CXXFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CFLAGS) -BASELIB_CXXFLAGS = $(__baselib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ - $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) \ + $(CXXFLAGS) BASELIB_OBJECTS = \ baselib_appbase.o \ baselib_clntdata.o \ @@ -463,16 +463,16 @@ BASELIB_OBJECTS = \ baselib_utilscmn.o \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3) \ $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3) -COREDLL_CFLAGS = $(__coredll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +COREDLL_CFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(PIC_FLAG) $(CPPFLAGS) \ + $(CFLAGS) +COREDLL_CXXFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_CORE \ - -DwxUSE_BASE=0 $(CFLAGS) $(PIC_FLAG) -COREDLL_CXXFLAGS = $(__coredll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ - $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_CORE \ - -DwxUSE_BASE=0 $(CXXFLAGS) $(PIC_FLAG) + -DwxUSE_BASE=0 $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) COREDLL_OBJECTS = \ coredll_event.o \ coredll_fs_mem.o \ @@ -481,14 +481,14 @@ COREDLL_OBJECTS = \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) \ $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4) \ $(__CORE_SRC_OBJECTS_2) -CORELIB_CFLAGS = $(__corelib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +CORELIB_CFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS) +CORELIB_CXXFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CFLAGS) -CORELIB_CXXFLAGS = $(__corelib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ - $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CPPFLAGS) $(CXXFLAGS) CORELIB_OBJECTS = \ corelib_event.o \ corelib_fs_mem.o \ @@ -497,38 +497,37 @@ CORELIB_OBJECTS = \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5) \ $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5) \ $(__CORE_SRC_OBJECTS_3) -DBGRIDDLL_CXXFLAGS = $(__dbgriddll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +DBGRIDDLL_CXXFLAGS = $(__dbgriddll_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_DBGRID \ - $(CXXFLAGS) $(PIC_FLAG) + $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) DBGRIDDLL_OBJECTS = \ dbgriddll_dbgrid.o -DBGRIDLIB_CXXFLAGS = $(__dbgridlib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +DBGRIDLIB_CXXFLAGS = $(__dbgridlib_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS) DBGRIDLIB_OBJECTS = \ dbgridlib_dbgrid.o DESTDIR = -GLDLL_CXXFLAGS = $(__gldll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ - $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_GL $(CXXFLAGS) \ - $(PIC_FLAG) +GLDLL_CXXFLAGS = $(__gldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_GL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) GLDLL_OBJECTS = \ $(__OPENGL_SRC_OBJECTS) -GLLIB_CXXFLAGS = $(__gllib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ - $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXFLAGS) +GLLIB_CXXFLAGS = $(__gllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + $(CPPFLAGS) $(CXXFLAGS) GLLIB_OBJECTS = \ $(__OPENGL_SRC_OBJECTS_1) -HTMLDLL_CXXFLAGS = $(__htmldll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +HTMLDLL_CXXFLAGS = $(__htmldll_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_HTML \ - $(CXXFLAGS) $(PIC_FLAG) + $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) HTMLDLL_OBJECTS = \ $(__HTML_SRC_PLATFORM_OBJECTS_2) \ htmldll_helpctrl.o \ @@ -552,10 +551,10 @@ HTMLDLL_OBJECTS = \ htmldll_m_tables.o \ htmldll_winpars.o \ htmldll_htmllbox.o -HTMLLIB_CXXFLAGS = $(__htmllib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +HTMLLIB_CXXFLAGS = $(__htmllib_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS) HTMLLIB_OBJECTS = \ $(__HTML_SRC_PLATFORM_OBJECTS_3) \ htmllib_helpctrl.o \ @@ -581,16 +580,15 @@ HTMLLIB_OBJECTS = \ htmllib_htmllbox.o LIBDIRNAME = $(top_builddir)lib LOCALE_LINGUAS = ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk zh zh_CN zh_TW -MONODLL_CFLAGS = $(__monodll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +MONODLL_CFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS) +MONODLL_CXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(CFLAGS) \ - $(PIC_FLAG) -MONODLL_CXXFLAGS = $(__monodll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ - $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(CXXFLAGS) \ - $(PIC_FLAG) + $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) \ + $(CPPFLAGS) $(CXXFLAGS) MONODLL_OBJECTS = \ monodll_appbase.o \ monodll_clntdata.o \ @@ -666,14 +664,14 @@ MONODLL_OBJECTS = \ $(__MONOLIB_GUI_SRC_OBJECTS) \ monodll_xml.o \ monodll_xtixml.o -MONOLIB_CFLAGS = $(__monolib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ - $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 $(CFLAGS) -MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +MONOLIB_CFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) +MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 $(CXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS) MONOLIB_OBJECTS = \ monolib_appbase.o \ monolib_clntdata.o \ @@ -749,16 +747,16 @@ MONOLIB_OBJECTS = \ $(__MONOLIB_GUI_SRC_OBJECTS_1) \ monolib_xml.o \ monolib_xtixml.o -NETDLL_CFLAGS = $(__netdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ - $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ - -DWXMAKINGDLL_NET $(CFLAGS) $(PIC_FLAG) -NETDLL_CXXFLAGS = $(__netdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ - $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ - -DWXMAKINGDLL_NET $(CXXFLAGS) $(PIC_FLAG) +NETDLL_CFLAGS = $(__netdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(PIC_FLAG) $(CPPFLAGS) \ + $(CFLAGS) +NETDLL_CXXFLAGS = $(__netdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(PIC_FLAG) $(CPPFLAGS) \ + $(CXXFLAGS) NETDLL_OBJECTS = \ netdll_fs_inet.o \ netdll_ftp.o \ @@ -771,14 +769,14 @@ NETDLL_OBJECTS = \ netdll_socket.o \ netdll_url.o \ $(__NET_PLATFORM_SRC_OBJECTS_2) -NETLIB_CFLAGS = $(__netlib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ - $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CFLAGS) -NETLIB_CXXFLAGS = $(__netlib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ - $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CXXFLAGS) +NETLIB_CFLAGS = $(__netlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 $(CPPFLAGS) $(CFLAGS) +NETLIB_CXXFLAGS = $(__netlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS) NETLIB_OBJECTS = \ netlib_fs_inet.o \ netlib_ftp.o \ @@ -791,27 +789,27 @@ NETLIB_OBJECTS = \ netlib_socket.o \ netlib_url.o \ $(__NET_PLATFORM_SRC_OBJECTS_3) -ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ - -DWXMAKINGDLL_ODBC $(CXXFLAGS) $(PIC_FLAG) + -DWXMAKINGDLL_ODBC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) ODBCDLL_OBJECTS = \ odbcdll_db.o \ odbcdll_dbtable.o -ODBCLIB_CXXFLAGS = $(__odbclib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +ODBCLIB_CXXFLAGS = $(__odbclib_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS) ODBCLIB_OBJECTS = \ odbclib_db.o \ odbclib_dbtable.o -WXEXPAT_CFLAGS = $(CPPFLAGS) -I./src/expat $(CFLAGS) +WXEXPAT_CFLAGS = -I./src/expat $(CPPFLAGS) $(CFLAGS) WXEXPAT_OBJECTS = \ wxexpat_xmlparse.o \ wxexpat_xmlrole.o \ wxexpat_xmltok.o -WXJPEG_CFLAGS = $(CPPFLAGS) $(CFLAGS) +WXJPEG_CFLAGS = $(CPPFLAGS) $(CFLAGS) WXJPEG_OBJECTS = \ wxjpeg_jcomapi.o \ wxjpeg_jutils.o \ @@ -859,7 +857,7 @@ WXJPEG_OBJECTS = \ wxjpeg_jquant1.o \ wxjpeg_jquant2.o \ wxjpeg_jdmerge.o -WXODBC_CFLAGS = $(CPPFLAGS) $(CFLAGS) +WXODBC_CFLAGS = $(CPPFLAGS) $(CFLAGS) WXODBC_OBJECTS = \ wxodbc_catalog.o \ wxodbc_connect.o \ @@ -876,7 +874,7 @@ WXODBC_OBJECTS = \ wxodbc_misc.o \ wxodbc_prepare.o \ wxodbc_result.o -WXPNG_CFLAGS = $(CPPFLAGS) $(__INC_ZLIB_p) $(CFLAGS) +WXPNG_CFLAGS = $(__INC_ZLIB_p) $(CPPFLAGS) $(CFLAGS) WXPNG_OBJECTS = \ wxpng_png.o \ wxpng_pngerror.o \ @@ -895,13 +893,13 @@ WXPNG_OBJECTS = \ wxpng_pngwrite.o \ wxpng_pngwtran.o \ wxpng_pngwutil.o -WXREGEX_CFLAGS = $(CPPFLAGS) $(CFLAGS) +WXREGEX_CFLAGS = $(CPPFLAGS) $(CFLAGS) WXREGEX_OBJECTS = \ wxregex_regcomp.o \ wxregex_regexec.o \ wxregex_regerror.o \ wxregex_regfree.o -WXTIFF_CFLAGS = $(CPPFLAGS) $(CFLAGS) +WXTIFF_CFLAGS = $(CPPFLAGS) $(CFLAGS) WXTIFF_OBJECTS = \ $(__TIFF_PLATFORM_SRC_OBJECTS) \ wxtiff_tif_aux.o \ @@ -936,7 +934,7 @@ WXTIFF_OBJECTS = \ wxtiff_tif_warning.o \ wxtiff_tif_write.o \ wxtiff_tif_zip.o -WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS) +WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS) WXZLIB_OBJECTS = \ wxzlib_adler32.o \ wxzlib_compress.o \ @@ -953,18 +951,18 @@ WXZLIB_OBJECTS = \ wxzlib_infutil.o \ wxzlib_inffast.o WX_VERSION = 2.5.1 -XMLDLL_CXXFLAGS = $(__xmldll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ - $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ - -DWXMAKINGDLL_XML $(CXXFLAGS) $(PIC_FLAG) +XMLDLL_CXXFLAGS = $(__xmldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_XML $(PIC_FLAG) $(CPPFLAGS) \ + $(CXXFLAGS) XMLDLL_OBJECTS = \ xmldll_xml.o \ xmldll_xtixml.o -XMLLIB_CXXFLAGS = $(__xmllib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \ - $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CXXFLAGS) +XMLLIB_CXXFLAGS = $(__xmllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS) XMLLIB_OBJECTS = \ xmllib_xml.o \ xmllib_xtixml.o diff --git a/contrib/samples/animate/Makefile.in b/contrib/samples/animate/Makefile.in index 7a50d2314f..327b824a38 100644 --- a/contrib/samples/animate/Makefile.in +++ b/contrib/samples/animate/Makefile.in @@ -34,9 +34,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ANITEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +ANITEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS) + -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ + $(CXXFLAGS) ANITEST_OBJECTS = \ $(__anitest_os2_lib_res) \ anitest_anitest.o \ diff --git a/contrib/samples/deprecated/proplist/Makefile.in b/contrib/samples/deprecated/proplist/Makefile.in index 30f9a14e9d..174959ce4a 100644 --- a/contrib/samples/deprecated/proplist/Makefile.in +++ b/contrib/samples/deprecated/proplist/Makefile.in @@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -PROPLIST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +PROPLIST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CXXFLAGS) + -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ + $(CXXFLAGS) PROPLIST_OBJECTS = \ $(__proplist_os2_lib_res) \ proplist_proplist.o \ diff --git a/contrib/samples/deprecated/resource/Makefile.in b/contrib/samples/deprecated/resource/Makefile.in index 6930e2631f..0c99b9fb02 100644 --- a/contrib/samples/deprecated/resource/Makefile.in +++ b/contrib/samples/deprecated/resource/Makefile.in @@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -RESOURCE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +RESOURCE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CXXFLAGS) + -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ + $(CXXFLAGS) RESOURCE_OBJECTS = \ $(__resource_os2_lib_res) \ resource_resource.o \ diff --git a/contrib/samples/deprecated/treelay/Makefile.in b/contrib/samples/deprecated/treelay/Makefile.in index 9b0fe754ce..53c0939b26 100644 --- a/contrib/samples/deprecated/treelay/Makefile.in +++ b/contrib/samples/deprecated/treelay/Makefile.in @@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TREELAY_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +TREELAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CXXFLAGS) + -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ + $(CXXFLAGS) TREELAY_OBJECTS = \ $(__treelay_os2_lib_res) \ treelay_treelay.o \ diff --git a/contrib/samples/fl/Makefile.in b/contrib/samples/fl/Makefile.in index b397fc659a..8a715a34f3 100644 --- a/contrib/samples/fl/Makefile.in +++ b/contrib/samples/fl/Makefile.in @@ -35,42 +35,42 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -FL_DEMO1_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +FL_DEMO1_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) + -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS) FL_DEMO1_OBJECTS = \ $(__fl) \ fl_demo1_fl_demo1.o \ $(__fl_demo1___win32rc) -FL_DEMO2_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +FL_DEMO2_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) + -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS) FL_DEMO2_OBJECTS = \ $(__fl) \ fl_demo2_fl_demo2.o \ $(__fl_demo2___win32rc) -FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +FL_SAMPLE1_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) + -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS) FL_SAMPLE1_OBJECTS = \ $(__fl) \ fl_sample1_fl_sample1.o \ $(__fl_sample1___win32rc) -FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +FL_SAMPLE2_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) + -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS) FL_SAMPLE2_OBJECTS = \ $(__fl) \ fl_sample2_fl_sample2.o \ $(__fl_sample2___win32rc) -FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +FL_SAMPLE3_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) + -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS) FL_SAMPLE3_OBJECTS = \ $(__fl) \ fl_sample3_fl_sample3.o \ diff --git a/contrib/samples/gizmos/dynsash/Makefile.in b/contrib/samples/gizmos/dynsash/Makefile.in index 9ab628fab0..2026cba6ae 100644 --- a/contrib/samples/gizmos/dynsash/Makefile.in +++ b/contrib/samples/gizmos/dynsash/Makefile.in @@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DYNSASH_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +DYNSASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CXXFLAGS) + -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ + $(CXXFLAGS) DYNSASH_OBJECTS = \ $(__dynsash___win32rc) \ $(__dynsash_os2_lib_res) \ diff --git a/contrib/samples/gizmos/dynsash_switch/Makefile.in b/contrib/samples/gizmos/dynsash_switch/Makefile.in index c1bedba5a8..82986c34b7 100644 --- a/contrib/samples/gizmos/dynsash_switch/Makefile.in +++ b/contrib/samples/gizmos/dynsash_switch/Makefile.in @@ -35,9 +35,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DYNSASH_SWITCH_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +DYNSASH_SWITCH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CXXFLAGS) + -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ + $(CXXFLAGS) DYNSASH_SWITCH_OBJECTS = \ $(__dynsash_switch___win32rc) \ $(__dynsash_switch_os2_lib_res) \ diff --git a/contrib/samples/gizmos/editlbox/Makefile.in b/contrib/samples/gizmos/editlbox/Makefile.in index c772ed5d14..d3a3a6d8e8 100644 --- a/contrib/samples/gizmos/editlbox/Makefile.in +++ b/contrib/samples/gizmos/editlbox/Makefile.in @@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CXXFLAGS) + -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ + $(CXXFLAGS) TEST_OBJECTS = \ $(__test___win32rc) \ $(__test_os2_lib_res) \ diff --git a/contrib/samples/gizmos/led/Makefile.in b/contrib/samples/gizmos/led/Makefile.in index c4ec62a989..449460caf7 100644 --- a/contrib/samples/gizmos/led/Makefile.in +++ b/contrib/samples/gizmos/led/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -LED_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CXXFLAGS) +LED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \ + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ + -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS) LED_OBJECTS = \ $(__led___win32rc) \ $(__led_os2_lib_res) \ diff --git a/contrib/samples/gizmos/multicell/Makefile.in b/contrib/samples/gizmos/multicell/Makefile.in index 0e0ebedfb7..e616a1ef15 100644 --- a/contrib/samples/gizmos/multicell/Makefile.in +++ b/contrib/samples/gizmos/multicell/Makefile.in @@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +MTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CXXFLAGS) + -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ + $(CXXFLAGS) MTEST_OBJECTS = \ $(__mtest___win32rc) \ $(__mtest_os2_lib_res) \ diff --git a/contrib/samples/gizmos/splittree/Makefile.in b/contrib/samples/gizmos/splittree/Makefile.in index 4368978cb0..89ab5a9287 100644 --- a/contrib/samples/gizmos/splittree/Makefile.in +++ b/contrib/samples/gizmos/splittree/Makefile.in @@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -SPLITTREE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +SPLITTREE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CXXFLAGS) + -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ + $(CXXFLAGS) SPLITTREE_OBJECTS = \ $(__splittree___win32rc) \ $(__splittree_os2_lib_res) \ diff --git a/contrib/samples/mmedia/Makefile.in b/contrib/samples/mmedia/Makefile.in index 300f6db689..e76ed0574b 100644 --- a/contrib/samples/mmedia/Makefile.in +++ b/contrib/samples/mmedia/Makefile.in @@ -37,9 +37,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MMBOARD_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +MMBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS) + -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ + $(CXXFLAGS) MMBOARD_OBJECTS = \ $(__mmboard_os2_lib_res) \ mmboard_mmboard.o \ diff --git a/contrib/samples/ogl/ogledit/Makefile.in b/contrib/samples/ogl/ogledit/Makefile.in index 9167c6d8d5..b73c89c5a3 100644 --- a/contrib/samples/ogl/ogledit/Makefile.in +++ b/contrib/samples/ogl/ogledit/Makefile.in @@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -OGLEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +OGLEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CXXFLAGS) + -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ + $(CXXFLAGS) OGLEDIT_OBJECTS = \ $(__ogledit_os2_lib_res) \ ogledit_ogledit.o \ diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in index e46f6fddc0..55089711c0 100644 --- a/contrib/samples/ogl/studio/Makefile.in +++ b/contrib/samples/ogl/studio/Makefile.in @@ -37,9 +37,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -STUDIO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +STUDIO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CXXFLAGS) + -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ + $(CXXFLAGS) STUDIO_OBJECTS = \ $(__studio_os2_lib_res) \ studio_studio.o \ diff --git a/contrib/samples/plot/Makefile.in b/contrib/samples/plot/Makefile.in index d4bf9693bc..c736240537 100644 --- a/contrib/samples/plot/Makefile.in +++ b/contrib/samples/plot/Makefile.in @@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -PLOT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +PLOT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS) + -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ + $(CXXFLAGS) PLOT_OBJECTS = \ $(__plot_os2_lib_res) \ plot_plot.o \ diff --git a/contrib/samples/stc/Makefile.in b/contrib/samples/stc/Makefile.in index 735ff591a1..ecd5b2e8eb 100644 --- a/contrib/samples/stc/Makefile.in +++ b/contrib/samples/stc/Makefile.in @@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -STCTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS) + -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ + $(CXXFLAGS) STCTEST_OBJECTS = \ $(__stctest___win32rc) \ $(__stctest_os2_lib_res) \ diff --git a/contrib/samples/svg/Makefile.in b/contrib/samples/svg/Makefile.in index c487ea8888..1cac1fd766 100644 --- a/contrib/samples/svg/Makefile.in +++ b/contrib/samples/svg/Makefile.in @@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -SVGTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +SVGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS) + -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ + $(CXXFLAGS) SVGTEST_OBJECTS = \ $(__svgtest___win32rc) \ $(__svgtest_os2_lib_res) \ diff --git a/contrib/samples/xrc/Makefile.in b/contrib/samples/xrc/Makefile.in index 4c23287572..2c70c4bfab 100644 --- a/contrib/samples/xrc/Makefile.in +++ b/contrib/samples/xrc/Makefile.in @@ -39,9 +39,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib WX_VERSION = 2.5.1 -XRCDEMO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +XRCDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS) + -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ + $(CXXFLAGS) XRCDEMO_OBJECTS = \ $(__xrcdemo_os2_lib_res) \ xrcdemo_xrcdemo.o \ diff --git a/contrib/src/animate/Makefile.in b/contrib/src/animate/Makefile.in index 955f084ec5..048f1955cd 100644 --- a/contrib/src/animate/Makefile.in +++ b/contrib/src/animate/Makefile.in @@ -42,14 +42,14 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ANIMATEDLL_CXXFLAGS = $(__animatedll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +ANIMATEDLL_CXXFLAGS = $(__animatedll_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE $(CXXFLAGS) $(PIC_FLAG) + -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) ANIMATEDLL_OBJECTS = \ animatedll_animate.o -ANIMATELIB_CXXFLAGS = $(__animatelib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +ANIMATELIB_CXXFLAGS = $(__animatelib_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - $(CXXFLAGS) + $(CPPFLAGS) $(CXXFLAGS) ANIMATELIB_OBJECTS = \ animatelib_animate.o DESTDIR = diff --git a/contrib/src/deprecated/Makefile.in b/contrib/src/deprecated/Makefile.in index d5c184bfac..611e7c423e 100644 --- a/contrib/src/deprecated/Makefile.in +++ b/contrib/src/deprecated/Makefile.in @@ -44,14 +44,14 @@ top_srcdir = @top_srcdir@ ### Variables: ### -DEPRECATEDDLL_CFLAGS = $(__deprecateddll_PCH_INC) $(CPPFLAGS) \ - -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \ - -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED -I$(srcdir) \ - $(CFLAGS) $(PIC_FLAG) -DEPRECATEDDLL_CXXFLAGS = $(__deprecateddll_PCH_INC) $(CPPFLAGS) \ - -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \ - -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED -I$(srcdir) \ - $(CXXFLAGS) $(PIC_FLAG) +DEPRECATEDDLL_CFLAGS = $(__deprecateddll_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ + -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED -I$(srcdir) $(PIC_FLAG) $(CPPFLAGS) \ + $(CFLAGS) +DEPRECATEDDLL_CXXFLAGS = $(__deprecateddll_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ + -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED -I$(srcdir) $(PIC_FLAG) $(CPPFLAGS) \ + $(CXXFLAGS) DEPRECATEDDLL_OBJECTS = \ deprecateddll_prop.o \ deprecateddll_propform.o \ @@ -61,12 +61,12 @@ DEPRECATEDDLL_OBJECTS = \ deprecateddll_treelay.o \ deprecateddll_wxexpr.o \ deprecateddll_dosyacc.o -DEPRECATEDLIB_CFLAGS = $(__deprecatedlib_PCH_INC) $(CPPFLAGS) \ - -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \ - -I$(srcdir)/../../include -I$(srcdir) $(CFLAGS) -DEPRECATEDLIB_CXXFLAGS = $(__deprecatedlib_PCH_INC) $(CPPFLAGS) \ - -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \ - -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) +DEPRECATEDLIB_CFLAGS = $(__deprecatedlib_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ + -I$(srcdir) $(CPPFLAGS) $(CFLAGS) +DEPRECATEDLIB_CXXFLAGS = $(__deprecatedlib_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ + -I$(srcdir) $(CPPFLAGS) $(CXXFLAGS) DEPRECATEDLIB_OBJECTS = \ deprecatedlib_prop.o \ deprecatedlib_propform.o \ diff --git a/contrib/src/fl/Makefile.in b/contrib/src/fl/Makefile.in index 35b4d44539..5a346dfef8 100644 --- a/contrib/src/fl/Makefile.in +++ b/contrib/src/fl/Makefile.in @@ -43,9 +43,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -FLDLL_CXXFLAGS = $(__fldll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -DWXUSINGDLL -DWXMAKINGDLL_FL $(CXXFLAGS) $(PIC_FLAG) +FLDLL_CXXFLAGS = $(__fldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_FL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) FLDLL_OBJECTS = \ fldll_antiflickpl.o \ fldll_bardragpl.o \ @@ -64,9 +64,8 @@ FLDLL_OBJECTS = \ fldll_rowlayoutpl.o \ fldll_toolwnd.o \ fldll_updatesmgr.o -FLLIB_CXXFLAGS = $(__fllib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - $(CXXFLAGS) +FLLIB_CXXFLAGS = $(__fllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS) FLLIB_OBJECTS = \ fllib_antiflickpl.o \ fllib_bardragpl.o \ diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in index 0882c05c98..4b8460f2e5 100644 --- a/contrib/src/gizmos/Makefile.in +++ b/contrib/src/gizmos/Makefile.in @@ -43,9 +43,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -GIZMOSDLL_CXXFLAGS = $(__gizmosdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +GIZMOSDLL_CXXFLAGS = $(__gizmosdll_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS $(CXXFLAGS) $(PIC_FLAG) + -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) GIZMOSDLL_OBJECTS = \ gizmosdll_dynamicsash.o \ gizmosdll_editlbox.o \ @@ -53,9 +53,9 @@ GIZMOSDLL_OBJECTS = \ gizmosdll_multicell.o \ gizmosdll_splittree.o \ gizmosdll_statpict.o -GIZMOSLIB_CXXFLAGS = $(__gizmoslib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +GIZMOSLIB_CXXFLAGS = $(__gizmoslib_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - $(CXXFLAGS) + $(CPPFLAGS) $(CXXFLAGS) GIZMOSLIB_OBJECTS = \ gizmoslib_dynamicsash.o \ gizmoslib_editlbox.o \ diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in index ec943e1255..8b4a1d3c2d 100644 --- a/contrib/src/mmedia/Makefile.in +++ b/contrib/src/mmedia/Makefile.in @@ -45,9 +45,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MMEDIADLL_CXXFLAGS = $(__mmediadll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +MMEDIADLL_CXXFLAGS = $(__mmediadll_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -DWXUSINGDLL -DWXMAKINGDLL_MMEDIA $(CXXFLAGS) $(PIC_FLAG) + -DWXUSINGDLL -DWXMAKINGDLL_MMEDIA $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) MMEDIADLL_OBJECTS = \ $(__MMEDIA_PLATFORM_SRC_OBJECTS) \ mmediadll_cdbase.o \ @@ -67,9 +67,9 @@ MMEDIADLL_OBJECTS = \ mmediadll_sndulaw.o \ mmediadll_sndwav.o \ mmediadll_vidbase.o -MMEDIALIB_CXXFLAGS = $(__mmedialib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +MMEDIALIB_CXXFLAGS = $(__mmedialib_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - $(CXXFLAGS) + $(CPPFLAGS) $(CXXFLAGS) MMEDIALIB_OBJECTS = \ $(__MMEDIA_PLATFORM_SRC_OBJECTS_1) \ mmedialib_cdbase.o \ diff --git a/contrib/src/net/Makefile.in b/contrib/src/net/Makefile.in index 64c30875fc..de3537617e 100644 --- a/contrib/src/net/Makefile.in +++ b/contrib/src/net/Makefile.in @@ -44,16 +44,16 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -NETUTILSDLL_CXXFLAGS = $(__netutilsdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +NETUTILSDLL_CXXFLAGS = $(__netutilsdll_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -DWXUSINGDLL -DWXMAKINGDLL_NETUTILS $(CXXFLAGS) $(PIC_FLAG) + -DWXUSINGDLL -DWXMAKINGDLL_NETUTILS $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) NETUTILSDLL_OBJECTS = \ netutilsdll_email.o \ netutilsdll_smapi.o \ netutilsdll_web.o -NETUTILSLIB_CXXFLAGS = $(__netutilslib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +NETUTILSLIB_CXXFLAGS = $(__netutilslib_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - $(CXXFLAGS) + $(CPPFLAGS) $(CXXFLAGS) NETUTILSLIB_OBJECTS = \ netutilslib_email.o \ netutilslib_smapi.o \ diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in index 8f177e92db..15e76f6936 100644 --- a/contrib/src/ogl/Makefile.in +++ b/contrib/src/ogl/Makefile.in @@ -44,9 +44,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -OGLDLL_CXXFLAGS = $(__ogldll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -DWXUSINGDLL -DWXMAKINGDLL_OGL $(CXXFLAGS) $(PIC_FLAG) +OGLDLL_CXXFLAGS = $(__ogldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_OGL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) OGLDLL_OBJECTS = \ ogldll_basic2.o \ ogldll_canvas.o \ @@ -60,9 +60,8 @@ OGLDLL_OBJECTS = \ ogldll_constrnt.o \ ogldll_lines.o \ ogldll_ogldiag.o -OGLLIB_CXXFLAGS = $(__ogllib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - $(CXXFLAGS) +OGLLIB_CXXFLAGS = $(__ogllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS) OGLLIB_OBJECTS = \ ogllib_basic2.o \ ogllib_canvas.o \ diff --git a/contrib/src/plot/Makefile.in b/contrib/src/plot/Makefile.in index f98d82a183..be938b2abb 100644 --- a/contrib/src/plot/Makefile.in +++ b/contrib/src/plot/Makefile.in @@ -44,14 +44,14 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -PLOTDLL_CXXFLAGS = $(__plotdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +PLOTDLL_CXXFLAGS = $(__plotdll_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -DWXUSINGDLL -DWXMAKINGDLL_PLOT $(CXXFLAGS) $(PIC_FLAG) + -DWXUSINGDLL -DWXMAKINGDLL_PLOT $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) PLOTDLL_OBJECTS = \ plotdll_plot.o -PLOTLIB_CXXFLAGS = $(__plotlib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +PLOTLIB_CXXFLAGS = $(__plotlib_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - $(CXXFLAGS) + $(CPPFLAGS) $(CXXFLAGS) PLOTLIB_OBJECTS = \ plotlib_plot.o WX_VERSION = 2.5.1 diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in index e86be15385..12fc8e2da3 100644 --- a/contrib/src/stc/Makefile.in +++ b/contrib/src/stc/Makefile.in @@ -44,11 +44,11 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -STCDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +STCDLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir)/../../include \ -I$(srcdir)/scintilla/include -I$(srcdir)/scintilla/src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(CXXFLAGS) \ - $(PIC_FLAG) + -DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(PIC_FLAG) \ + $(CPPFLAGS) $(CXXFLAGS) STCDLL_OBJECTS = \ stcdll_PlatWX.o \ stcdll_ScintillaWX.o \ @@ -103,10 +103,10 @@ STCDLL_OBJECTS = \ stcdll_ViewStyle.o \ stcdll_WindowAccessor.o \ stcdll_XPM.o -STCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +STCLIB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir)/../../include \ -I$(srcdir)/scintilla/include -I$(srcdir)/scintilla/src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS) + -DSCI_LEXER -DLINK_LEXERS $(CPPFLAGS) $(CXXFLAGS) STCLIB_OBJECTS = \ stclib_PlatWX.o \ stclib_ScintillaWX.o \ diff --git a/contrib/src/svg/Makefile.in b/contrib/src/svg/Makefile.in index 2df933e120..75e8e70daf 100644 --- a/contrib/src/svg/Makefile.in +++ b/contrib/src/svg/Makefile.in @@ -44,14 +44,13 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -SVGDLL_CXXFLAGS = $(__svgdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -DWXUSINGDLL -DWXMAKINGDLL_SVG $(CXXFLAGS) $(PIC_FLAG) +SVGDLL_CXXFLAGS = $(__svgdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_SVG $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) SVGDLL_OBJECTS = \ svgdll_dcsvg.o -SVGLIB_CXXFLAGS = $(__svglib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - $(CXXFLAGS) +SVGLIB_CXXFLAGS = $(__svglib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS) SVGLIB_OBJECTS = \ svglib_dcsvg.o WX_VERSION = 2.5.1 diff --git a/contrib/src/xrc/Makefile.in b/contrib/src/xrc/Makefile.in index 74821aa2b0..d465acab5c 100644 --- a/contrib/src/xrc/Makefile.in +++ b/contrib/src/xrc/Makefile.in @@ -47,9 +47,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib WX_VERSION = 2.5.1 -XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -DWXUSINGDLL -DWXMAKINGDLL_XRC $(CXXFLAGS) $(PIC_FLAG) +XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_XRC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) XRCDLL_OBJECTS = \ xrcdll_xmlres.o \ xrcdll_xh_bmp.o \ @@ -88,9 +88,9 @@ XRCDLL_OBJECTS = \ xrcdll_xh_unkwn.o \ xrcdll_xh_wizrd.o \ xrcdll_xmlrsall.o -XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) +XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include -I$(srcdir)/../../include \ + -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CPPFLAGS) $(CXXFLAGS) XRCLIB_OBJECTS = \ xrclib_xmlres.o \ xrclib_xh_bmp.o \ diff --git a/contrib/utils/convertrc/Makefile.in b/contrib/utils/convertrc/Makefile.in index 7f95562055..d5efdd43f5 100644 --- a/contrib/utils/convertrc/Makefile.in +++ b/contrib/utils/convertrc/Makefile.in @@ -37,9 +37,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CONVERTRC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +CONVERTRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS) + -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ + $(CXXFLAGS) CONVERTRC_OBJECTS = \ $(__convertrc_os2_lib_res) \ convertrc_convert.o \ diff --git a/contrib/utils/wxrc/Makefile.in b/contrib/utils/wxrc/Makefile.in index 04e76252ef..59d32bf7a2 100644 --- a/contrib/utils/wxrc/Makefile.in +++ b/contrib/utils/wxrc/Makefile.in @@ -35,8 +35,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WXRC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +WXRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS) WXRC_OBJECTS = \ wxrc_wxrc.o diff --git a/contrib/utils/wxrcedit/Makefile.in b/contrib/utils/wxrcedit/Makefile.in index c0febf3050..811b09a195 100644 --- a/contrib/utils/wxrcedit/Makefile.in +++ b/contrib/utils/wxrcedit/Makefile.in @@ -40,9 +40,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WXRCEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +WXRCEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS) + -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ + $(CXXFLAGS) WXRCEDIT_OBJECTS = \ $(__wxrcedit_os2_lib_res) \ wxrcedit_edapp.o \ diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in index 90e3ecfe4a..09cf1492d9 100644 --- a/demos/bombs/Makefile.in +++ b/demos/bombs/Makefile.in @@ -34,9 +34,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### -BOMBS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +BOMBS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) BOMBS_OBJECTS = \ $(__bombs_os2_lib_res) \ bombs_bombs.o \ diff --git a/demos/dbbrowse/Makefile.in b/demos/dbbrowse/Makefile.in index 7dcbe63852..34a135f1e8 100644 --- a/demos/dbbrowse/Makefile.in +++ b/demos/dbbrowse/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### -DBBROWSE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +DBBROWSE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DBBROWSE_OBJECTS = \ $(__dbbrowse_os2_lib_res) \ dbbrowse_dbbrowse.o \ diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in index 13630dbcfd..2500fe7963 100644 --- a/demos/forty/Makefile.in +++ b/demos/forty/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -FORTY_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) FORTY_OBJECTS = \ $(__forty_os2_lib_res) \ forty_forty.o \ diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in index fca305607f..a276d3991e 100644 --- a/demos/fractal/Makefile.in +++ b/demos/fractal/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -FRACTAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +FRACTAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) FRACTAL_OBJECTS = \ $(__fractal_os2_lib_res) \ fractal_fractal.o \ diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in index ddd01c44bb..150b33a88f 100644 --- a/demos/life/Makefile.in +++ b/demos/life/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -LIFE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) LIFE_OBJECTS = \ $(__life_os2_lib_res) \ life_life.o \ diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in index 0708764832..dee44d38c0 100644 --- a/demos/poem/Makefile.in +++ b/demos/poem/Makefile.in @@ -37,9 +37,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WXPOEM_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +WXPOEM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) WXPOEM_OBJECTS = \ $(__wxpoem_os2_lib_res) \ wxpoem_wxpoem.o \ diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in index b30d12fc51..1d72f8a245 100644 --- a/samples/access/Makefile.in +++ b/samples/access/Makefile.in @@ -34,9 +34,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ACCESSTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +ACCESSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) ACCESSTEST_OBJECTS = \ $(__accesstest_os2_lib_res) \ accesstest_accesstest.o \ diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in index bf1e69ab7f..88b7e7b11f 100644 --- a/samples/artprov/Makefile.in +++ b/samples/artprov/Makefile.in @@ -34,9 +34,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ARTTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +ARTTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) ARTTEST_OBJECTS = \ $(__arttest_os2_lib_res) \ arttest_arttest.o \ diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in index 516994586b..8503a69501 100644 --- a/samples/calendar/Makefile.in +++ b/samples/calendar/Makefile.in @@ -34,9 +34,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CALENDAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +CALENDAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) CALENDAR_OBJECTS = \ $(__calendar_os2_lib_res) \ calendar_calendar.o \ diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index 922dfc708e..5bdf6e9fce 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -34,9 +34,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CARET_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) CARET_OBJECTS = \ $(__caret_os2_lib_res) \ caret_caret.o \ diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in index 40978d0645..96e66b4ce9 100644 --- a/samples/checklst/Makefile.in +++ b/samples/checklst/Makefile.in @@ -34,9 +34,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CHECKLST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +CHECKLST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) CHECKLST_OBJECTS = \ $(__checklst_os2_lib_res) \ checklst_checklst.o \ diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index ec2f39c9d8..1ef91141b9 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -34,9 +34,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CONFTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) CONFTEST_OBJECTS = \ $(__conftest_os2_lib_res) \ conftest_conftest.o \ diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in index 8e32521922..d18363f4be 100644 --- a/samples/console/Makefile.in +++ b/samples/console/Makefile.in @@ -29,9 +29,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CONSOLE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +CONSOLE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) $(__MULTILIB_FLAG_p) \ - $(CXXFLAGS) + $(CPPFLAGS) $(CXXFLAGS) CONSOLE_OBJECTS = \ console_console.o DESTDIR = diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in index 1ecb326476..e9c4f230e9 100644 --- a/samples/controls/Makefile.in +++ b/samples/controls/Makefile.in @@ -34,9 +34,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CONTROLS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +CONTROLS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) CONTROLS_OBJECTS = \ $(__controls_os2_lib_res) \ controls_controls.o \ diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in index fbaa273404..2c109b9e5a 100644 --- a/samples/db/Makefile.in +++ b/samples/db/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### -DBTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +DBTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DBTEST_OBJECTS = \ $(__dbtest_os2_lib_res) \ dbtest_dbtest.o \ diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index 408cb32194..01011a2680 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DIALOGS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DIALOGS_OBJECTS = \ $(__dialogs_os2_lib_res) \ dialogs_dialogs.o \ diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index 1e57abf225..32812423b9 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -NETTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) NETTEST_OBJECTS = \ $(__nettest_os2_lib_res) \ nettest_nettest.o \ diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in index acd5c3c42c..dedf50da3e 100644 --- a/samples/display/Makefile.in +++ b/samples/display/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DISPLAY_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +DISPLAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DISPLAY_OBJECTS = \ $(__display___win32rc) \ $(__display_os2_lib_res) \ diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index deb0716033..d6e55d55b9 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DND_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) +DND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \ + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DND_OBJECTS = \ $(__dnd_os2_lib_res) \ dnd_dnd.o \ diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index 550985417b..f1313421ea 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DOCVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DOCVIEW_OBJECTS = \ $(__docview_os2_lib_res) \ docview_docview.o \ diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in index f5699efeec..6e9fc63786 100644 --- a/samples/docvwmdi/Makefile.in +++ b/samples/docvwmdi/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DOCVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DOCVIEW_OBJECTS = \ $(__docview_os2_lib_res) \ docview_docview.o \ diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index e24de157ce..699a96b094 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DRAGIMAG_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +DRAGIMAG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DRAGIMAG_OBJECTS = \ $(__dragimag_os2_lib_res) \ dragimag_dragimag.o \ diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index 4bc3c79fbe..ed5371c8a3 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DRAWING_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +DRAWING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DRAWING_OBJECTS = \ $(__drawing_os2_lib_res) \ drawing_drawing.o \ diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in index ca8d1064a2..7241d46303 100644 --- a/samples/dynamic/Makefile.in +++ b/samples/dynamic/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DYNAMIC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +DYNAMIC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DYNAMIC_OBJECTS = \ $(__dynamic_os2_lib_res) \ dynamic_dynamic.o \ diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in index afd6d50c5b..41025503b1 100644 --- a/samples/erase/Makefile.in +++ b/samples/erase/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -ERASE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +ERASE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) ERASE_OBJECTS = \ $(__erase_os2_lib_res) \ erase_erase.o \ diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in index a55134eab1..1c7109fbcd 100644 --- a/samples/event/Makefile.in +++ b/samples/event/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -EVENT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +EVENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) EVENT_OBJECTS = \ $(__event_os2_lib_res) \ event_event.o \ diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in index 411b364797..a95271f30f 100644 --- a/samples/except/Makefile.in +++ b/samples/except/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -EXCEPT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +EXCEPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) EXCEPT_OBJECTS = \ $(__except___win32rc) \ $(__except_os2_lib_res) \ diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index 68fae7f91e..9282ecb04c 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -EXEC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +EXEC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) EXEC_OBJECTS = \ $(__exec_os2_lib_res) \ exec_exec.o \ diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index 1aa74edb40..e43f35c127 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -FONT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +FONT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) FONT_OBJECTS = \ $(__font_os2_lib_res) \ font_font.o \ diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index d741bacbb3..81ce42a5ac 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -GRID_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) GRID_OBJECTS = \ $(__grid_os2_lib_res) \ grid_griddemo.o \ diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index bc160b3a60..ff6556a4a1 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -HELP_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) HELP_OBJECTS = \ $(__help_os2_lib_res) \ help_demo.o \ diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index 13e45deb27..997ecb7127 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -HTLBOX_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +HTLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) HTLBOX_OBJECTS = \ $(__htlbox_os2_lib_res) \ htlbox_htlbox.o \ diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in index 2984c67d90..7bc34a4151 100644 --- a/samples/html/about/Makefile.in +++ b/samples/html/about/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ABOUT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +ABOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CXXFLAGS) + -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) ABOUT_OBJECTS = \ $(__about_os2_lib_res) \ about_about.o \ diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in index 8f03882212..db4105effb 100644 --- a/samples/html/help/Makefile.in +++ b/samples/html/help/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -HELP_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CXXFLAGS) + -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) HELP_OBJECTS = \ $(__help_os2_lib_res) \ help_help.o \ diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in index 9603e56551..a1ff41a2d5 100644 --- a/samples/html/helpview/Makefile.in +++ b/samples/html/helpview/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -HELPVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CXXFLAGS) + -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) HELPVIEW_OBJECTS = \ $(__helpview_os2_lib_res) \ helpview_helpview.o \ diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in index efc9df00c6..a22a83d722 100644 --- a/samples/html/printing/Makefile.in +++ b/samples/html/printing/Makefile.in @@ -37,9 +37,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -PRINTING_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CXXFLAGS) + -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) PRINTING_OBJECTS = \ $(__printing_os2_lib_res) \ printing_printing.o \ diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in index 862f9e47c2..d670d6f469 100644 --- a/samples/html/test/Makefile.in +++ b/samples/html/test/Makefile.in @@ -37,9 +37,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CXXFLAGS) + -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ $(__test_os2_lib_res) \ test_test.o \ diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in index 570bc5c3b4..2e67f68a47 100644 --- a/samples/html/virtual/Makefile.in +++ b/samples/html/virtual/Makefile.in @@ -37,9 +37,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -VIRTUAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CXXFLAGS) + -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) VIRTUAL_OBJECTS = \ $(__virtual_os2_lib_res) \ virtual_virtual.o \ diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in index c3d2862a88..294df4c59e 100644 --- a/samples/html/widget/Makefile.in +++ b/samples/html/widget/Makefile.in @@ -37,9 +37,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WIDGET_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CXXFLAGS) + -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) WIDGET_OBJECTS = \ $(__widget_os2_lib_res) \ widget_widget.o \ diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in index d1c10996b0..5a5d642ba0 100644 --- a/samples/html/zip/Makefile.in +++ b/samples/html/zip/Makefile.in @@ -38,9 +38,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib WX_VERSION = 2.5.1 -ZIP_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CXXFLAGS) +ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \ + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \ + $(CXXFLAGS) ZIP_OBJECTS = \ $(__zip_os2_lib_res) \ zip_zip.o \ diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index c24b77b030..abb79030ed 100644 --- a/samples/image/Makefile.in +++ b/samples/image/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -IMAGE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) IMAGE_OBJECTS = \ $(__image_os2_lib_res) \ image_image.o \ diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in index 3bb5f17083..562863fda9 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -INTERNAT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) INTERNAT_OBJECTS = \ $(__internat_os2_lib_res) \ internat_internat.o \ diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index e700f583ab..ba31a04b26 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -34,18 +34,18 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CLIENT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) CLIENT_OBJECTS = \ $(__client___win32rc) \ $(os2_lib_res) \ client_client.o DESTDIR = LIBDIRNAME = $(top_builddir)lib -SERVER_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +SERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) SERVER_OBJECTS = \ $(__server___win32rc) \ $(os2_lib_res) \ diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index 41bd8c6fe0..445c6f6a4d 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -JOYTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +JOYTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) JOYTEST_OBJECTS = \ $(__joytest_os2_lib_res) \ joytest_joytest.o \ diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in index d71f6e03dd..8e636ee608 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -KEYBOARD_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +KEYBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) KEYBOARD_OBJECTS = \ $(__keyboard_os2_lib_res) \ keyboard_keyboard.o \ diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index 42bf740622..66e1392b39 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -LAYOUT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +LAYOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) LAYOUT_OBJECTS = \ $(__layout_os2_lib_res) \ layout_layout.o \ diff --git a/samples/listbox/Makefile.in b/samples/listbox/Makefile.in index 3895882d8b..e0e5a846e6 100644 --- a/samples/listbox/Makefile.in +++ b/samples/listbox/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -LISTBOX_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +LISTBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) LISTBOX_OBJECTS = \ $(__listbox___win32rc) \ $(__listbox_os2_lib_res) \ diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index caff427689..1d61c793ad 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -LISTCTRL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +LISTCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) LISTCTRL_OBJECTS = \ $(__listctrl_os2_lib_res) \ listctrl_listtest.o \ diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index a732826a67..77978d9461 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MDI_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) +MDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \ + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) MDI_OBJECTS = \ $(__mdi_os2_lib_res) \ mdi_mdi.o \ diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in index a29c42da65..c562687c21 100644 --- a/samples/memcheck/Makefile.in +++ b/samples/memcheck/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MEMCHECK_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +MEMCHECK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) MEMCHECK_OBJECTS = \ $(__memcheck_os2_lib_res) \ memcheck_memcheck.o \ diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in index a414f940d4..04ca833c84 100644 --- a/samples/menu/Makefile.in +++ b/samples/menu/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MENU_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +MENU_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) MENU_OBJECTS = \ $(__menu_os2_lib_res) \ menu_menu.o \ diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in index 6ba209d127..512f49f995 100644 --- a/samples/mfc/Makefile.in +++ b/samples/mfc/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MFCTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +MFCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) MFCTEST_OBJECTS = \ $(__mfctest_os2_lib_res) \ mfctest_mfctest.o \ diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in index f1974ccde2..5731e41c4c 100644 --- a/samples/minifram/Makefile.in +++ b/samples/minifram/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MINIFRAM_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +MINIFRAM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) MINIFRAM_OBJECTS = \ $(__minifram_os2_lib_res) \ minifram_minifram.o \ diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index 02067eac61..5fa7f4fca3 100644 --- a/samples/minimal/Makefile.in +++ b/samples/minimal/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MINIMAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +MINIMAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) MINIMAL_OBJECTS = \ $(__minimal___win32rc) \ $(__minimal_os2_lib_res) \ diff --git a/samples/mobile/styles/Makefile.in b/samples/mobile/styles/Makefile.in index 62b8bdda60..e826047a3b 100644 --- a/samples/mobile/styles/Makefile.in +++ b/samples/mobile/styles/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -STYLES_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +STYLES_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CXXFLAGS) + -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) STYLES_OBJECTS = \ $(__styles___win32rc) \ $(__styles_os2_lib_res) \ diff --git a/samples/mobile/wxedit/Makefile.in b/samples/mobile/wxedit/Makefile.in index ca647e3e91..1805494ede 100644 --- a/samples/mobile/wxedit/Makefile.in +++ b/samples/mobile/wxedit/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WXEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +WXEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CXXFLAGS) + -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) WXEDIT_OBJECTS = \ $(__wxedit___win32rc) \ $(__wxedit_os2_lib_res) \ diff --git a/samples/multimon/Makefile.in b/samples/multimon/Makefile.in index 5ec32159b4..934bf59d62 100644 --- a/samples/multimon/Makefile.in +++ b/samples/multimon/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MULTIMON_TEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +MULTIMON_TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) MULTIMON_TEST_OBJECTS = \ $(__multimon_test___win32rc) \ $(__multimon_test_os2_lib_res) \ diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in index 75a88e5169..fada6e7695 100644 --- a/samples/nativdlg/Makefile.in +++ b/samples/nativdlg/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -NATIVDLG_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +NATIVDLG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) NATIVDLG_OBJECTS = \ $(__nativdlg_os2_lib_res) \ nativdlg_nativdlg.o \ diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in index 2f4444d607..b364c3e353 100644 --- a/samples/notebook/Makefile.in +++ b/samples/notebook/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -NOTEBOOK_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +NOTEBOOK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) NOTEBOOK_OBJECTS = \ $(__notebook_os2_lib_res) \ notebook_notebook.o \ diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in index a25e0f8a5a..e137e3fbb6 100644 --- a/samples/oleauto/Makefile.in +++ b/samples/oleauto/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -OLEAUTO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +OLEAUTO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) OLEAUTO_OBJECTS = \ $(__oleauto_os2_lib_res) \ oleauto_oleauto.o \ diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in index 9e889f9c5f..604af341b6 100644 --- a/samples/opengl/cube/Makefile.in +++ b/samples/opengl/cube/Makefile.in @@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CUBE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CXXFLAGS) + -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) CUBE_OBJECTS = \ $(__cube_os2_lib_res) \ cube_cube.o \ diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in index c8df016c6d..09149ad9aa 100644 --- a/samples/opengl/isosurf/Makefile.in +++ b/samples/opengl/isosurf/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -ISOSURF_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CXXFLAGS) + -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) ISOSURF_OBJECTS = \ $(__isosurf___win32rc) \ $(__isosurf_os2_lib_res) \ diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in index 61cad832c3..0732d09f80 100644 --- a/samples/opengl/penguin/Makefile.in +++ b/samples/opengl/penguin/Makefile.in @@ -39,12 +39,12 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -PENGUIN_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CFLAGS) -PENGUIN_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(srcdir)/../../../samples $(CPPFLAGS) $(CFLAGS) +PENGUIN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CXXFLAGS) + -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) PENGUIN_OBJECTS = \ $(__penguin_os2_lib_res) \ penguin_penguin.o \ diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in index fb24ede454..caa3221bb4 100644 --- a/samples/ownerdrw/Makefile.in +++ b/samples/ownerdrw/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -OWNERDRW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +OWNERDRW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) OWNERDRW_OBJECTS = \ $(__ownerdrw_os2_lib_res) \ ownerdrw_ownerdrw.o \ diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in index f860d3b525..4d6d0452d8 100644 --- a/samples/png/Makefile.in +++ b/samples/png/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -PNG_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) +PNG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \ + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) PNG_OBJECTS = \ $(__png_os2_lib_res) \ png_pngdemo.o \ diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index fd5658fa77..db9ed0b23f 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -PRINTING_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) PRINTING_OBJECTS = \ $(__printing_os2_lib_res) \ printing_printing.o \ diff --git a/samples/propsize/Makefile.in b/samples/propsize/Makefile.in index 525a11ec07..10deca3c1a 100644 --- a/samples/propsize/Makefile.in +++ b/samples/propsize/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -PROPSIZE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +PROPSIZE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) PROPSIZE_OBJECTS = \ $(__propsize_os2_lib_res) \ propsize_propsize.o \ diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in index 772fd894e1..dcc342c852 100644 --- a/samples/regtest/Makefile.in +++ b/samples/regtest/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -REGTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +REGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) REGTEST_OBJECTS = \ $(__regtest_os2_lib_res) \ regtest_regtest.o \ diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in index 727768b666..247e2886f3 100644 --- a/samples/render/Makefile.in +++ b/samples/render/Makefile.in @@ -40,13 +40,13 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -RENDDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -DWXUSINGDLL $(CXXFLAGS) $(PIC_FLAG) +RENDDLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include -DWXUSINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) RENDDLL_OBJECTS = \ renddll_renddll.o -RENDER_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) RENDER_OBJECTS = \ $(__render___win32rc) \ $(__render_os2_lib_res) \ diff --git a/samples/richedit/Makefile.in b/samples/richedit/Makefile.in index 18db2c52dc..4dae584d8b 100644 --- a/samples/richedit/Makefile.in +++ b/samples/richedit/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -RICHEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +RICHEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) RICHEDIT_OBJECTS = \ $(__richedit___win32rc) \ $(__richedit_os2_lib_res) \ diff --git a/samples/rotate/Makefile.in b/samples/rotate/Makefile.in index b847294372..b8a582c546 100644 --- a/samples/rotate/Makefile.in +++ b/samples/rotate/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -ROTATE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +ROTATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) ROTATE_OBJECTS = \ $(__rotate_os2_lib_res) \ rotate_rotate.o \ diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in index 2079cf0523..ca1aa99f96 100644 --- a/samples/sashtest/Makefile.in +++ b/samples/sashtest/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -SASHTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +SASHTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) SASHTEST_OBJECTS = \ $(__sashtest_os2_lib_res) \ sashtest_sashtest.o \ diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in index aeb98274f1..ca79d18b96 100644 --- a/samples/scroll/Makefile.in +++ b/samples/scroll/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -SCROLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +SCROLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) SCROLL_OBJECTS = \ $(__scroll_os2_lib_res) \ scroll_scroll.o \ diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in index 055f31ffaf..efb37a3575 100644 --- a/samples/scrollsub/Makefile.in +++ b/samples/scrollsub/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -SCROLLSUB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +SCROLLSUB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) SCROLLSUB_OBJECTS = \ $(__scrollsub_os2_lib_res) \ scrollsub_scrollsub.o \ diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in index 36a294cee2..ce918b46ef 100644 --- a/samples/shaped/Makefile.in +++ b/samples/shaped/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -SHAPED_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +SHAPED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) SHAPED_OBJECTS = \ $(__shaped_os2_lib_res) \ shaped_shaped.o \ diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in index ac7846ccae..4a4cadc093 100644 --- a/samples/sockets/Makefile.in +++ b/samples/sockets/Makefile.in @@ -34,18 +34,18 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CLIENT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) CLIENT_OBJECTS = \ $(os2_lib_res) \ client_client.o \ $(__client___win32rc) DESTDIR = LIBDIRNAME = $(top_builddir)lib -SERVER_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +SERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) SERVER_OBJECTS = \ $(os2_lib_res) \ server_server.o \ diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in index b5fce2f0ff..feacfd9510 100644 --- a/samples/splitter/Makefile.in +++ b/samples/splitter/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -SPLITTER_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +SPLITTER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) SPLITTER_OBJECTS = \ $(__splitter_os2_lib_res) \ splitter_splitter.o \ diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in index 41d1f095f3..4cdb59e2c7 100644 --- a/samples/statbar/Makefile.in +++ b/samples/statbar/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -STATBAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +STATBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) STATBAR_OBJECTS = \ $(__statbar_os2_lib_res) \ statbar_statbar.o \ diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in index 735ff591a1..ecd5b2e8eb 100644 --- a/samples/stc/Makefile.in +++ b/samples/stc/Makefile.in @@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -STCTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS) + -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ + $(CXXFLAGS) STCTEST_OBJECTS = \ $(__stctest___win32rc) \ $(__stctest_os2_lib_res) \ diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in index c487ea8888..1cac1fd766 100644 --- a/samples/svg/Makefile.in +++ b/samples/svg/Makefile.in @@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -SVGTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +SVGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS) + -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ + $(CXXFLAGS) SVGTEST_OBJECTS = \ $(__svgtest___win32rc) \ $(__svgtest_os2_lib_res) \ diff --git a/samples/tab/Makefile.in b/samples/tab/Makefile.in index db93d3add0..90b0239b9c 100644 --- a/samples/tab/Makefile.in +++ b/samples/tab/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TAB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) +TAB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \ + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) TAB_OBJECTS = \ $(__tab_os2_lib_res) \ tab_tab.o \ diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index f102bbb4a6..84d44ab707 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TASKBAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +TASKBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) TASKBAR_OBJECTS = \ $(__taskbar_os2_lib_res) \ taskbar_tbtest.o \ diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in index 1db712dfeb..ee3d60d691 100644 --- a/samples/text/Makefile.in +++ b/samples/text/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TEXT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +TEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) TEXT_OBJECTS = \ $(__text_os2_lib_res) \ text_text.o \ diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in index a5e853282d..dd5133ab5d 100644 --- a/samples/thread/Makefile.in +++ b/samples/thread/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -THREAD_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +THREAD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) THREAD_OBJECTS = \ $(__thread_os2_lib_res) \ thread_thread.o \ diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in index 530731bebb..2480761bf4 100644 --- a/samples/toolbar/Makefile.in +++ b/samples/toolbar/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TOOLBAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +TOOLBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) TOOLBAR_OBJECTS = \ $(__toolbar_os2_lib_res) \ toolbar_toolbar.o \ diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in index 101b8d5247..cd72bb9327 100644 --- a/samples/treectrl/Makefile.in +++ b/samples/treectrl/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TREECTRL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +TREECTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) TREECTRL_OBJECTS = \ $(__treectrl_os2_lib_res) \ treectrl_treetest.o \ diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in index 45bf706b79..8361a43701 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TYPETEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +TYPETEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) TYPETEST_OBJECTS = \ $(__typetest_os2_lib_res) \ typetest_typetest.o \ diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in index e23d564048..c5ddcf2870 100644 --- a/samples/validate/Makefile.in +++ b/samples/validate/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -VALIDATE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +VALIDATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) VALIDATE_OBJECTS = \ $(__validate_os2_lib_res) \ validate_validate.o \ diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in index 75467ac080..9bbc12b0ce 100644 --- a/samples/vscroll/Makefile.in +++ b/samples/vscroll/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -VSTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +VSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) VSTEST_OBJECTS = \ $(__vstest___win32rc) \ $(__vstest_os2_lib_res) \ diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in index 7ec152c86e..11bbb10579 100644 --- a/samples/widgets/Makefile.in +++ b/samples/widgets/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WIDGETS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +WIDGETS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) WIDGETS_OBJECTS = \ $(__widgets_os2_lib_res) \ widgets_button.o \ diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in index 70b9411ad7..e45b24405a 100644 --- a/samples/wizard/Makefile.in +++ b/samples/wizard/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WIZARD_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +WIZARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) WIZARD_OBJECTS = \ $(__wizard_os2_lib_res) \ wizard_wizard.o \ diff --git a/samples/wxtest/Makefile.in b/samples/wxtest/Makefile.in index 6b8274c3d1..a35a8c265c 100644 --- a/samples/wxtest/Makefile.in +++ b/samples/wxtest/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WXTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +WXTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) WXTEST_OBJECTS = \ $(__wxtest___win32rc) \ $(__wxtest_os2_lib_res) \ diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in index 4c23287572..2c70c4bfab 100644 --- a/samples/xrc/Makefile.in +++ b/samples/xrc/Makefile.in @@ -39,9 +39,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib WX_VERSION = 2.5.1 -XRCDEMO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +XRCDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS) + -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ + $(CXXFLAGS) XRCDEMO_OBJECTS = \ $(__xrcdemo_os2_lib_res) \ xrcdemo_xrcdemo.o \ diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in index e86be15385..12fc8e2da3 100644 --- a/src/stc/Makefile.in +++ b/src/stc/Makefile.in @@ -44,11 +44,11 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -STCDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +STCDLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir)/../../include \ -I$(srcdir)/scintilla/include -I$(srcdir)/scintilla/src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(CXXFLAGS) \ - $(PIC_FLAG) + -DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(PIC_FLAG) \ + $(CPPFLAGS) $(CXXFLAGS) STCDLL_OBJECTS = \ stcdll_PlatWX.o \ stcdll_ScintillaWX.o \ @@ -103,10 +103,10 @@ STCDLL_OBJECTS = \ stcdll_ViewStyle.o \ stcdll_WindowAccessor.o \ stcdll_XPM.o -STCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +STCLIB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir)/../../include \ -I$(srcdir)/scintilla/include -I$(srcdir)/scintilla/src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS) + -DSCI_LEXER -DLINK_LEXERS $(CPPFLAGS) $(CXXFLAGS) STCLIB_OBJECTS = \ stclib_PlatWX.o \ stclib_ScintillaWX.o \ diff --git a/src/xrc/Makefile.in b/src/xrc/Makefile.in index 74821aa2b0..d465acab5c 100644 --- a/src/xrc/Makefile.in +++ b/src/xrc/Makefile.in @@ -47,9 +47,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib WX_VERSION = 2.5.1 -XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -DWXUSINGDLL -DWXMAKINGDLL_XRC $(CXXFLAGS) $(PIC_FLAG) +XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_XRC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) XRCDLL_OBJECTS = \ xrcdll_xmlres.o \ xrcdll_xh_bmp.o \ @@ -88,9 +88,9 @@ XRCDLL_OBJECTS = \ xrcdll_xh_unkwn.o \ xrcdll_xh_wizrd.o \ xrcdll_xmlrsall.o -XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) +XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include -I$(srcdir)/../../include \ + -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CPPFLAGS) $(CXXFLAGS) XRCLIB_OBJECTS = \ xrclib_xmlres.o \ xrclib_xh_bmp.o \ diff --git a/utils/HelpGen/src/Makefile.in b/utils/HelpGen/src/Makefile.in index f0b7ed1f55..0477972f3f 100644 --- a/utils/HelpGen/src/Makefile.in +++ b/utils/HelpGen/src/Makefile.in @@ -28,8 +28,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -HELPGEN_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +HELPGEN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS) HELPGEN_OBJECTS = \ HelpGen_HelpGen.o \ HelpGen_cjparser.o \ diff --git a/utils/configtool/src/Makefile.in b/utils/configtool/src/Makefile.in index 2f32db2537..ca4e30cb96 100644 --- a/utils/configtool/src/Makefile.in +++ b/utils/configtool/src/Makefile.in @@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WXCONFIGTOOL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +WXCONFIGTOOL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CXXFLAGS) + -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) WXCONFIGTOOL_OBJECTS = \ $(__wxconfigtool___win32rc) \ $(__wxconfigtool_os2_lib_res) \ diff --git a/utils/emulator/src/Makefile.in b/utils/emulator/src/Makefile.in index 12c9964f96..5898fdd59b 100644 --- a/utils/emulator/src/Makefile.in +++ b/utils/emulator/src/Makefile.in @@ -34,9 +34,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WXEMULATOR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +WXEMULATOR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CXXFLAGS) + -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) WXEMULATOR_OBJECTS = \ $(__wxemulator___win32rc) \ $(__wxemulator_os2_lib_res) \ diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in index 1e93ca2e56..e34c331dd3 100644 --- a/utils/helpview/src/Makefile.in +++ b/utils/helpview/src/Makefile.in @@ -38,9 +38,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -HELPVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CXXFLAGS) + -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) HELPVIEW_OBJECTS = \ $(__helpview_os2_lib_res) \ helpview_helpview.o \ diff --git a/utils/hhp2cached/Makefile.in b/utils/hhp2cached/Makefile.in index e961957486..25e7db0710 100644 --- a/utils/hhp2cached/Makefile.in +++ b/utils/hhp2cached/Makefile.in @@ -38,9 +38,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -HHP2CACHED_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +HHP2CACHED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) HHP2CACHED_OBJECTS = \ $(__hhp2cached_os2_lib_res) \ hhp2cached_hhp2cached.o \ diff --git a/utils/tex2rtf/src/Makefile.in b/utils/tex2rtf/src/Makefile.in index d209d6b1fe..cd0f8cf6c2 100644 --- a/utils/tex2rtf/src/Makefile.in +++ b/utils/tex2rtf/src/Makefile.in @@ -39,11 +39,12 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TEX2RTF_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) -DNO_GUI $(CXXFLAGS) -TEX2RTF_GUI_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +TEX2RTF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) -DNO_GUI $(CPPFLAGS) \ + $(CXXFLAGS) +TEX2RTF_GUI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CXXFLAGS) + -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) TEX2RTF_GUI_OBJECTS = \ $(__tex2rtf_gui___win32rc) \ $(__tex2rtf_gui_os2_lib_res) \ diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in index 04e76252ef..59d32bf7a2 100644 --- a/utils/wxrc/Makefile.in +++ b/utils/wxrc/Makefile.in @@ -35,8 +35,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WXRC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +WXRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS) WXRC_OBJECTS = \ wxrc_wxrc.o