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

After adding check to wx/mgl/chkconf.h for UNIV flag, our regex needs this flag delivered by makefiles (with rebaking).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-08-24 16:08:21 +00:00
parent 1d29ae8b5d
commit 99713fe395
9 changed files with 229 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
build/os2/makefile.wat
View File

@@ -176,6 +176,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_framemanager.obj &
$(OBJS)\monodll_dockart.obj &
$(OBJS)\monodll_floatpane.obj &
$(OBJS)\monodll_auibook.obj &
$(OBJS)\monodll_tabmdi.obj &
$(OBJS)\monodll_richtextctrl.obj &
$(OBJS)\monodll_richtextbuffer.obj &
$(OBJS)\monodll_richtextstyles.obj &
@@ -683,6 +685,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_framemanager.obj &
$(OBJS)\monolib_dockart.obj &
$(OBJS)\monolib_floatpane.obj &
$(OBJS)\monolib_auibook.obj &
$(OBJS)\monolib_tabmdi.obj &
$(OBJS)\monolib_richtextctrl.obj &
$(OBJS)\monolib_richtextbuffer.obj &
$(OBJS)\monolib_richtextstyles.obj &
@@ -2320,7 +2324,7 @@ SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -i=..\..\include -i=$(SETUPHDIR) -d__WXPM__ &
$(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS)
$(__WXUNIV_DEFINE_p) $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS)
WXREGEX_OBJECTS = &
$(OBJS)\wxregex_regcomp.obj &
$(OBJS)\wxregex_regexec.obj &
@@ -2507,6 +2511,7 @@ MONODLL_OBJECTS = &
$(OBJS)\monodll_module.obj &
$(OBJS)\monodll_mstream.obj &
$(OBJS)\monodll_object.obj &
$(OBJS)\monodll_platinfo.obj &
$(OBJS)\monodll_powercmn.obj &
$(OBJS)\monodll_process.obj &
$(OBJS)\monodll_regex.obj &
@@ -2605,6 +2610,7 @@ MONOLIB_OBJECTS = &
$(OBJS)\monolib_module.obj &
$(OBJS)\monolib_mstream.obj &
$(OBJS)\monolib_object.obj &
$(OBJS)\monolib_platinfo.obj &
$(OBJS)\monolib_powercmn.obj &
$(OBJS)\monolib_process.obj &
$(OBJS)\monolib_regex.obj &
@@ -2703,6 +2709,7 @@ BASEDLL_OBJECTS = &
$(OBJS)\basedll_module.obj &
$(OBJS)\basedll_mstream.obj &
$(OBJS)\basedll_object.obj &
$(OBJS)\basedll_platinfo.obj &
$(OBJS)\basedll_powercmn.obj &
$(OBJS)\basedll_process.obj &
$(OBJS)\basedll_regex.obj &
@@ -2787,6 +2794,7 @@ BASELIB_OBJECTS = &
$(OBJS)\baselib_module.obj &
$(OBJS)\baselib_mstream.obj &
$(OBJS)\baselib_object.obj &
$(OBJS)\baselib_platinfo.obj &
$(OBJS)\baselib_powercmn.obj &
$(OBJS)\baselib_process.obj &
$(OBJS)\baselib_regex.obj &
@@ -3229,7 +3237,9 @@ AUIDLL_OBJECTS = &
$(OBJS)\auidll_dummy.obj &
$(OBJS)\auidll_framemanager.obj &
$(OBJS)\auidll_dockart.obj &
$(OBJS)\auidll_floatpane.obj
$(OBJS)\auidll_floatpane.obj &
$(OBJS)\auidll_auibook.obj &
$(OBJS)\auidll_tabmdi.obj
AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
@@ -3242,7 +3252,9 @@ AUILIB_OBJECTS = &
$(OBJS)\auilib_dummy.obj &
$(OBJS)\auilib_framemanager.obj &
$(OBJS)\auilib_dockart.obj &
$(OBJS)\auilib_floatpane.obj
$(OBJS)\auilib_floatpane.obj &
$(OBJS)\auilib_auibook.obj &
$(OBJS)\auilib_tabmdi.obj
RICHTEXTDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
@@ -3516,14 +3528,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!ifeq MONOLITHIC 0
!ifeq SHARED 1
!ifeq USE_GUI 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.dll : $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll___depname) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.dll : $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
@%create $(OBJS)\advdll.lbc
@%append $(OBJS)\advdll.lbc option quiet
@%append $(OBJS)\advdll.lbc name $^@
@%append $(OBJS)\advdll.lbc option caseexact
@%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
@for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\advdll.lbc library %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\advdll.lbc library %i
@%append $(OBJS)\advdll.lbc
@%append $(OBJS)\advdll.lbc system os2v2 dll
wlink @$(OBJS)\advdll.lbc
@@ -4366,6 +4378,9 @@ $(OBJS)\monodll_mstream.obj : .AUTODEPEND ..\..\src\common\mstream.cpp
$(OBJS)\monodll_object.obj : .AUTODEPEND ..\..\src\common\object.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_platinfo.obj : .AUTODEPEND ..\..\src\common\platinfo.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_powercmn.obj : .AUTODEPEND ..\..\src\common\powercmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -4936,6 +4951,12 @@ $(OBJS)\monodll_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp
$(OBJS)\monodll_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6109,6 +6130,9 @@ $(OBJS)\monolib_mstream.obj : .AUTODEPEND ..\..\src\common\mstream.cpp
$(OBJS)\monolib_object.obj : .AUTODEPEND ..\..\src\common\object.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_platinfo.obj : .AUTODEPEND ..\..\src\common\platinfo.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_powercmn.obj : .AUTODEPEND ..\..\src\common\powercmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -6679,6 +6703,12 @@ $(OBJS)\monolib_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp
$(OBJS)\monolib_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7852,6 +7882,9 @@ $(OBJS)\basedll_mstream.obj : .AUTODEPEND ..\..\src\common\mstream.cpp
$(OBJS)\basedll_object.obj : .AUTODEPEND ..\..\src\common\object.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\basedll_platinfo.obj : .AUTODEPEND ..\..\src\common\platinfo.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\basedll_powercmn.obj : .AUTODEPEND ..\..\src\common\powercmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
@@ -8056,6 +8089,9 @@ $(OBJS)\baselib_mstream.obj : .AUTODEPEND ..\..\src\common\mstream.cpp
$(OBJS)\baselib_object.obj : .AUTODEPEND ..\..\src\common\object.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\baselib_platinfo.obj : .AUTODEPEND ..\..\src\common\platinfo.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\baselib_powercmn.obj : .AUTODEPEND ..\..\src\common\powercmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
@@ -11206,6 +11242,12 @@ $(OBJS)\auidll_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp
$(OBJS)\auidll_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
$(OBJS)\auidll_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
$(OBJS)\auidll_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
$(OBJS)\auilib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
@@ -11218,6 +11260,12 @@ $(OBJS)\auilib_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp
$(OBJS)\auilib_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
$(OBJS)\auilib_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
$(OBJS)\auilib_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
$(OBJS)\richtextdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<