2.8.11.tag

git-svn-id: https://svn.wxwidgets.org/svn/wx/WX_2_8_11@64141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2010-04-26 08:15:16 +00:00
parent b7379c0e71
commit cc7a8fce91
154 changed files with 7359 additions and 10217 deletions

View File

@@ -4,7 +4,7 @@
# Do not modify, all changes will be overwritten!
# =========================================================================
!include ../../../build/msw/config.wat
!include ../../../build/os2/config.wat
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
@@ -36,14 +36,7 @@ PORTNAME =
PORTNAME = base
!endif
!ifeq USE_GUI 1
PORTNAME = msw
!endif
VENDORTAG =
!ifeq OFFICIAL_BUILD 0
VENDORTAG = _$(VENDOR)
!endif
!ifeq OFFICIAL_BUILD 1
VENDORTAG =
PORTNAME = pm
!endif
WXDEBUGFLAG =
!ifeq BUILD debug
@@ -68,10 +61,10 @@ WXDLLFLAG = dll
!endif
LIBTYPE_SUFFIX =
!ifeq SHARED 0
LIBTYPE_SUFFIX = lib
LIBTYPE_SUFFIX = pm_lib
!endif
!ifeq SHARED 1
LIBTYPE_SUFFIX = dll
LIBTYPE_SUFFIX = pm_dll
!endif
EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 0
@@ -83,7 +76,7 @@ EXTRALIBS_FOR_BASE =
__deprecateddll___depname =
!ifeq SHARED 1
__deprecateddll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG).dll
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.dll
!endif
__DEBUGINFO_2 =
!ifeq BUILD debug
@@ -119,18 +112,6 @@ __LIB_PNG_p =
!ifeq USE_GUI 1
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
__GDIPLUS_LIB_p =
!ifeq USE_GDIPLUS 1
__GDIPLUS_LIB_p = gdiplus.lib
!endif
__CAIRO_LIB_p =
!ifeq USE_CAIRO 1
__CAIRO_LIB_p = cairo.lib
!endif
____CAIRO_LIBDIR_FILENAMES_p =
!ifeq USE_CAIRO 1
____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib
!endif
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
@@ -249,7 +230,7 @@ LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
DEPRECATEDDLL_CFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\..\include &
@@ -257,7 +238,7 @@ DEPRECATEDDLL_CFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-dWXBUILDING -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
-dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $(CPPFLAGS) $(CFLAGS)
DEPRECATEDDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) &
$(__THREADSFLAG) $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) &
$(__THREADSFLAG) $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) &
$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
@@ -278,7 +259,7 @@ DEPRECATEDDLL_OBJECTS = &
$(OBJS)\deprecateddll_wxexpr.obj &
$(OBJS)\deprecateddll_dosyacc.obj
DEPRECATEDLIB_CFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\..\include &
@@ -286,7 +267,7 @@ DEPRECATEDLIB_CFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-dWXBUILDING -i=..\..\src\deprecated\..\..\include -i=..\..\src\deprecated &
$(CPPFLAGS) $(CFLAGS)
DEPRECATEDLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\..\include &
@@ -320,21 +301,21 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.dll
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
!ifeq SHARED 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG).dll : $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_version.res
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.dll : $(DEPRECATEDDLL_OBJECTS)
@%create $(OBJS)\deprecateddll.lbc
@%append $(OBJS)\deprecateddll.lbc option quiet
@%append $(OBJS)\deprecateddll.lbc name $^@
@%append $(OBJS)\deprecateddll.lbc option caseexact
@%append $(OBJS)\deprecateddll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@%append $(OBJS)\deprecateddll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(DEPRECATEDDLL_OBJECTS)) do @%append $(OBJS)\deprecateddll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\deprecateddll.lbc library %i
@%append $(OBJS)\deprecateddll.lbc option resource=$(OBJS)\deprecateddll_version.res
@%append $(OBJS)\deprecateddll.lbc system nt_dll
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\deprecateddll.lbc library %i
@%append $(OBJS)\deprecateddll.lbc
@%append $(OBJS)\deprecateddll.lbc system os2v2 dll
wlink @$(OBJS)\deprecateddll.lbc
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib +$^@
!endif
@@ -347,59 +328,56 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!endif
$(OBJS)\deprecateddll_dummy.obj : .AUTODEPEND ..\..\src\deprecated\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_version.res : .AUTODEPEND ..\..\src\deprecated\..\..\..\src\msw\version.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG) -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $<
$(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_prop.obj : .AUTODEPEND ..\..\src\deprecated\prop.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_propform.obj : .AUTODEPEND ..\..\src\deprecated\propform.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_proplist.obj : .AUTODEPEND ..\..\src\deprecated\proplist.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_resource.obj : .AUTODEPEND ..\..\src\deprecated\resource.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_tbarsmpl.obj : .AUTODEPEND ..\..\src\deprecated\tbarsmpl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_treelay.obj : .AUTODEPEND ..\..\src\deprecated\treelay.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_wxexpr.obj : .AUTODEPEND ..\..\src\deprecated\wxexpr.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_dosyacc.obj : .AUTODEPEND ..\..\src\deprecated\dosyacc.c
$(CC) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CFLAGS) $<
$(CC) -bt=os2 -zq -fo=$^@ $(DEPRECATEDDLL_CFLAGS) $<
$(OBJS)\deprecatedlib_dummy.obj : .AUTODEPEND ..\..\src\deprecated\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_prop.obj : .AUTODEPEND ..\..\src\deprecated\prop.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_propform.obj : .AUTODEPEND ..\..\src\deprecated\propform.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_proplist.obj : .AUTODEPEND ..\..\src\deprecated\proplist.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_resource.obj : .AUTODEPEND ..\..\src\deprecated\resource.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_tbarsmpl.obj : .AUTODEPEND ..\..\src\deprecated\tbarsmpl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_treelay.obj : .AUTODEPEND ..\..\src\deprecated\treelay.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_wxexpr.obj : .AUTODEPEND ..\..\src\deprecated\wxexpr.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_dosyacc.obj : .AUTODEPEND ..\..\src\deprecated\dosyacc.c
$(CC) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CFLAGS) $<
$(CC) -bt=os2 -zq -fo=$^@ $(DEPRECATEDLIB_CFLAGS) $<

View File

@@ -4,7 +4,7 @@
# Do not modify, all changes will be overwritten!
# =========================================================================
!include ../../../build/msw/config.wat
!include ../../../build/os2/config.wat
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
@@ -36,14 +36,7 @@ PORTNAME =
PORTNAME = base
!endif
!ifeq USE_GUI 1
PORTNAME = msw
!endif
VENDORTAG =
!ifeq OFFICIAL_BUILD 0
VENDORTAG = _$(VENDOR)
!endif
!ifeq OFFICIAL_BUILD 1
VENDORTAG =
PORTNAME = pm
!endif
WXDEBUGFLAG =
!ifeq BUILD debug
@@ -68,10 +61,10 @@ WXDLLFLAG = dll
!endif
LIBTYPE_SUFFIX =
!ifeq SHARED 0
LIBTYPE_SUFFIX = lib
LIBTYPE_SUFFIX = pm_lib
!endif
!ifeq SHARED 1
LIBTYPE_SUFFIX = dll
LIBTYPE_SUFFIX = pm_dll
!endif
EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 0
@@ -83,7 +76,7 @@ EXTRALIBS_FOR_BASE =
__fldll___depname =
!ifeq SHARED 1
__fldll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.dll
!endif
__DEBUGINFO_2 =
!ifeq BUILD debug
@@ -119,18 +112,6 @@ __LIB_PNG_p =
!ifeq USE_GUI 1
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
__GDIPLUS_LIB_p =
!ifeq USE_GDIPLUS 1
__GDIPLUS_LIB_p = gdiplus.lib
!endif
__CAIRO_LIB_p =
!ifeq USE_CAIRO 1
__CAIRO_LIB_p = cairo.lib
!endif
____CAIRO_LIBDIR_FILENAMES_p =
!ifeq USE_CAIRO 1
____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib
!endif
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
@@ -249,7 +230,7 @@ LIBDIRNAME = ..\..\src\fl\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
FLDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\fl\..\..\..\include &
@@ -277,7 +258,7 @@ FLDLL_OBJECTS = &
$(OBJS)\fldll_toolwnd.obj &
$(OBJS)\fldll_updatesmgr.obj
FLLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\fl\..\..\..\include &
@@ -319,21 +300,21 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.dll
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
!ifeq SHARED 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll : $(FLDLL_OBJECTS) $(OBJS)\fldll_version.res
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.dll : $(FLDLL_OBJECTS)
@%create $(OBJS)\fldll.lbc
@%append $(OBJS)\fldll.lbc option quiet
@%append $(OBJS)\fldll.lbc name $^@
@%append $(OBJS)\fldll.lbc option caseexact
@%append $(OBJS)\fldll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@%append $(OBJS)\fldll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(FLDLL_OBJECTS)) do @%append $(OBJS)\fldll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\fldll.lbc library %i
@%append $(OBJS)\fldll.lbc option resource=$(OBJS)\fldll_version.res
@%append $(OBJS)\fldll.lbc system nt_dll
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\fldll.lbc library %i
@%append $(OBJS)\fldll.lbc
@%append $(OBJS)\fldll.lbc system os2v2 dll
wlink @$(OBJS)\fldll.lbc
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib +$^@
!endif
@@ -346,113 +327,110 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!endif
$(OBJS)\fldll_dummy.obj : .AUTODEPEND ..\..\src\fl\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_version.res : .AUTODEPEND ..\..\src\fl\..\..\..\src\msw\version.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\fl\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG) -i=..\..\src\fl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_FL $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_antiflickpl.obj : .AUTODEPEND ..\..\src\fl\antiflickpl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_bardragpl.obj : .AUTODEPEND ..\..\src\fl\bardragpl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_barhintspl.obj : .AUTODEPEND ..\..\src\fl\barhintspl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_cbcustom.obj : .AUTODEPEND ..\..\src\fl\cbcustom.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_controlbar.obj : .AUTODEPEND ..\..\src\fl\controlbar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_dyntbar.obj : .AUTODEPEND ..\..\src\fl\dyntbar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_dyntbarhnd.obj : .AUTODEPEND ..\..\src\fl\dyntbarhnd.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_frmview.obj : .AUTODEPEND ..\..\src\fl\frmview.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_garbagec.obj : .AUTODEPEND ..\..\src\fl\garbagec.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_gcupdatesmgr.obj : .AUTODEPEND ..\..\src\fl\gcupdatesmgr.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_hintanimpl.obj : .AUTODEPEND ..\..\src\fl\hintanimpl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_newbmpbtn.obj : .AUTODEPEND ..\..\src\fl\newbmpbtn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_panedrawpl.obj : .AUTODEPEND ..\..\src\fl\panedrawpl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_rowdragpl.obj : .AUTODEPEND ..\..\src\fl\rowdragpl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_rowlayoutpl.obj : .AUTODEPEND ..\..\src\fl\rowlayoutpl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_toolwnd.obj : .AUTODEPEND ..\..\src\fl\toolwnd.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_updatesmgr.obj : .AUTODEPEND ..\..\src\fl\updatesmgr.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fllib_dummy.obj : .AUTODEPEND ..\..\src\fl\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_antiflickpl.obj : .AUTODEPEND ..\..\src\fl\antiflickpl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_bardragpl.obj : .AUTODEPEND ..\..\src\fl\bardragpl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_barhintspl.obj : .AUTODEPEND ..\..\src\fl\barhintspl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_cbcustom.obj : .AUTODEPEND ..\..\src\fl\cbcustom.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_controlbar.obj : .AUTODEPEND ..\..\src\fl\controlbar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_dyntbar.obj : .AUTODEPEND ..\..\src\fl\dyntbar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_dyntbarhnd.obj : .AUTODEPEND ..\..\src\fl\dyntbarhnd.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_frmview.obj : .AUTODEPEND ..\..\src\fl\frmview.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_garbagec.obj : .AUTODEPEND ..\..\src\fl\garbagec.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_gcupdatesmgr.obj : .AUTODEPEND ..\..\src\fl\gcupdatesmgr.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_hintanimpl.obj : .AUTODEPEND ..\..\src\fl\hintanimpl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_newbmpbtn.obj : .AUTODEPEND ..\..\src\fl\newbmpbtn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_panedrawpl.obj : .AUTODEPEND ..\..\src\fl\panedrawpl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_rowdragpl.obj : .AUTODEPEND ..\..\src\fl\rowdragpl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_rowlayoutpl.obj : .AUTODEPEND ..\..\src\fl\rowlayoutpl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_toolwnd.obj : .AUTODEPEND ..\..\src\fl\toolwnd.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_updatesmgr.obj : .AUTODEPEND ..\..\src\fl\updatesmgr.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<

View File

@@ -4,7 +4,7 @@
# Do not modify, all changes will be overwritten!
# =========================================================================
!include ../../../build/msw/config.wat
!include ../../../build/os2/config.wat
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
@@ -36,14 +36,7 @@ PORTNAME =
PORTNAME = base
!endif
!ifeq USE_GUI 1
PORTNAME = msw
!endif
VENDORTAG =
!ifeq OFFICIAL_BUILD 0
VENDORTAG = _$(VENDOR)
!endif
!ifeq OFFICIAL_BUILD 1
VENDORTAG =
PORTNAME = pm
!endif
WXDEBUGFLAG =
!ifeq BUILD debug
@@ -68,10 +61,10 @@ WXDLLFLAG = dll
!endif
LIBTYPE_SUFFIX =
!ifeq SHARED 0
LIBTYPE_SUFFIX = lib
LIBTYPE_SUFFIX = pm_lib
!endif
!ifeq SHARED 1
LIBTYPE_SUFFIX = dll
LIBTYPE_SUFFIX = pm_dll
!endif
EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 0
@@ -83,7 +76,7 @@ EXTRALIBS_FOR_BASE =
__foldbardll___depname =
!ifeq SHARED 1
__foldbardll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_wat$(VENDORTAG).dll
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.dll
!endif
__DEBUGINFO_2 =
!ifeq BUILD debug
@@ -119,18 +112,6 @@ __LIB_PNG_p =
!ifeq USE_GUI 1
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
__GDIPLUS_LIB_p =
!ifeq USE_GDIPLUS 1
__GDIPLUS_LIB_p = gdiplus.lib
!endif
__CAIRO_LIB_p =
!ifeq USE_CAIRO 1
__CAIRO_LIB_p = cairo.lib
!endif
____CAIRO_LIBDIR_FILENAMES_p =
!ifeq USE_CAIRO 1
____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib
!endif
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
@@ -249,7 +230,7 @@ LIBDIRNAME = ..\..\src\foldbar\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
FOLDBARDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\foldbar\..\..\..\include &
@@ -263,7 +244,7 @@ FOLDBARDLL_OBJECTS = &
$(OBJS)\foldbardll_foldpanelbar.obj &
$(OBJS)\foldbardll_foldpanelitem.obj
FOLDBARLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\foldbar\..\..\..\include &
@@ -292,21 +273,21 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_wat$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.dll
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib
!ifeq SHARED 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_wat$(VENDORTAG).dll : $(FOLDBARDLL_OBJECTS) $(OBJS)\foldbardll_version.res
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.dll : $(FOLDBARDLL_OBJECTS)
@%create $(OBJS)\foldbardll.lbc
@%append $(OBJS)\foldbardll.lbc option quiet
@%append $(OBJS)\foldbardll.lbc name $^@
@%append $(OBJS)\foldbardll.lbc option caseexact
@%append $(OBJS)\foldbardll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@%append $(OBJS)\foldbardll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(FOLDBARDLL_OBJECTS)) do @%append $(OBJS)\foldbardll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\foldbardll.lbc library %i
@%append $(OBJS)\foldbardll.lbc option resource=$(OBJS)\foldbardll_version.res
@%append $(OBJS)\foldbardll.lbc system nt_dll
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\foldbardll.lbc library %i
@%append $(OBJS)\foldbardll.lbc
@%append $(OBJS)\foldbardll.lbc system os2v2 dll
wlink @$(OBJS)\foldbardll.lbc
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib +$^@
!endif
@@ -319,29 +300,26 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!endif
$(OBJS)\foldbardll_dummy.obj : .AUTODEPEND ..\..\src\foldbar\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
$(OBJS)\foldbardll_version.res : .AUTODEPEND ..\..\src\foldbar\..\..\..\src\msw\version.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\foldbar\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_wat$(VENDORTAG) -i=..\..\src\foldbar\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_FOLDBAR $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
$(OBJS)\foldbardll_captionbar.obj : .AUTODEPEND ..\..\src\foldbar\captionbar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
$(OBJS)\foldbardll_foldpanelbar.obj : .AUTODEPEND ..\..\src\foldbar\foldpanelbar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
$(OBJS)\foldbardll_foldpanelitem.obj : .AUTODEPEND ..\..\src\foldbar\foldpanelitem.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
$(OBJS)\foldbarlib_dummy.obj : .AUTODEPEND ..\..\src\foldbar\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
$(OBJS)\foldbarlib_captionbar.obj : .AUTODEPEND ..\..\src\foldbar\captionbar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
$(OBJS)\foldbarlib_foldpanelbar.obj : .AUTODEPEND ..\..\src\foldbar\foldpanelbar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
$(OBJS)\foldbarlib_foldpanelitem.obj : .AUTODEPEND ..\..\src\foldbar\foldpanelitem.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<

View File

@@ -4,7 +4,7 @@
# Do not modify, all changes will be overwritten!
# =========================================================================
!include ../../../build/msw/config.wat
!include ../../../build/os2/config.wat
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
@@ -36,14 +36,7 @@ PORTNAME =
PORTNAME = base
!endif
!ifeq USE_GUI 1
PORTNAME = msw
!endif
VENDORTAG =
!ifeq OFFICIAL_BUILD 0
VENDORTAG = _$(VENDOR)
!endif
!ifeq OFFICIAL_BUILD 1
VENDORTAG =
PORTNAME = pm
!endif
WXDEBUGFLAG =
!ifeq BUILD debug
@@ -68,10 +61,10 @@ WXDLLFLAG = dll
!endif
LIBTYPE_SUFFIX =
!ifeq SHARED 0
LIBTYPE_SUFFIX = lib
LIBTYPE_SUFFIX = pm_lib
!endif
!ifeq SHARED 1
LIBTYPE_SUFFIX = dll
LIBTYPE_SUFFIX = pm_dll
!endif
EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 0
@@ -83,13 +76,13 @@ EXTRALIBS_FOR_BASE =
__gizmosdll___depname =
!ifeq SHARED 1
__gizmosdll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_wat$(VENDORTAG).dll
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.dll
!endif
__gizmos_xrcdll___depname =
!ifeq SHARED 1
!ifeq USE_XRC 1
__gizmos_xrcdll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_wat$(VENDORTAG).dll
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.dll
!endif
!endif
__WXLIB_XRC_p =
@@ -148,18 +141,6 @@ __LIB_PNG_p =
!ifeq USE_GUI 1
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
__GDIPLUS_LIB_p =
!ifeq USE_GDIPLUS 1
__GDIPLUS_LIB_p = gdiplus.lib
!endif
__CAIRO_LIB_p =
!ifeq USE_CAIRO 1
__CAIRO_LIB_p = cairo.lib
!endif
____CAIRO_LIBDIR_FILENAMES =
!ifeq USE_CAIRO 1
____CAIRO_LIBDIR_FILENAMES = libpath $(CAIRO_ROOT)\lib
!endif
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
@@ -273,7 +254,7 @@ LIBDIRNAME = ..\..\src\gizmos\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
GIZMOSDLL_CXXFLAGS = -bd $(__DEBUGINFO_3) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\gizmos\..\..\..\include &
@@ -290,7 +271,7 @@ GIZMOSDLL_OBJECTS = &
$(OBJS)\gizmosdll_splittree.obj &
$(OBJS)\gizmosdll_statpict.obj
GIZMOS_XRCDLL_CXXFLAGS = -bd $(__DEBUGINFO_3) $(__OPTIMIZEFLAG) &
$(__THREADSFLAG) $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) &
$(__THREADSFLAG) $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) &
$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\gizmos\..\..\..\include &
@@ -302,7 +283,7 @@ GIZMOS_XRCDLL_OBJECTS = &
$(OBJS)\gizmos_xrcdll_dummy.obj &
$(OBJS)\gizmos_xrcdll_xh_statpict.obj
GIZMOSLIB_CXXFLAGS = $(__DEBUGINFO_3) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\gizmos\..\..\..\include &
@@ -319,7 +300,7 @@ GIZMOSLIB_OBJECTS = &
$(OBJS)\gizmoslib_splittree.obj &
$(OBJS)\gizmoslib_statpict.obj
GIZMOS_XRCLIB_CXXFLAGS = $(__DEBUGINFO_3) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\gizmos\..\..\..\include &
@@ -346,40 +327,40 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_wat$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_wat$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.dll
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.dll
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib
!ifeq SHARED 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_wat$(VENDORTAG).dll : $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_version.res
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.dll : $(GIZMOSDLL_OBJECTS)
@%create $(OBJS)\gizmosdll.lbc
@%append $(OBJS)\gizmosdll.lbc option quiet
@%append $(OBJS)\gizmosdll.lbc name $^@
@%append $(OBJS)\gizmosdll.lbc option caseexact
@%append $(OBJS)\gizmosdll.lbc $(__DEBUGINFO) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)
@%append $(OBJS)\gizmosdll.lbc $(__DEBUGINFO) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(GIZMOSDLL_OBJECTS)) do @%append $(OBJS)\gizmosdll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\gizmosdll.lbc library %i
@%append $(OBJS)\gizmosdll.lbc option resource=$(OBJS)\gizmosdll_version.res
@%append $(OBJS)\gizmosdll.lbc system nt_dll
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\gizmosdll.lbc library %i
@%append $(OBJS)\gizmosdll.lbc
@%append $(OBJS)\gizmosdll.lbc system os2v2 dll
wlink @$(OBJS)\gizmosdll.lbc
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib +$^@
!endif
!ifeq SHARED 1
!ifeq USE_XRC 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_wat$(VENDORTAG).dll : $(GIZMOS_XRCDLL_OBJECTS) $(OBJS)\gizmos_xrcdll_version.res $(__gizmosdll___depname)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.dll : $(GIZMOS_XRCDLL_OBJECTS) $(__gizmosdll___depname)
@%create $(OBJS)\gizmos_xrcdll.lbc
@%append $(OBJS)\gizmos_xrcdll.lbc option quiet
@%append $(OBJS)\gizmos_xrcdll.lbc name $^@
@%append $(OBJS)\gizmos_xrcdll.lbc option caseexact
@%append $(OBJS)\gizmos_xrcdll.lbc $(__DEBUGINFO) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)
@%append $(OBJS)\gizmos_xrcdll.lbc $(__DEBUGINFO) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(GIZMOS_XRCDLL_OBJECTS)) do @%append $(OBJS)\gizmos_xrcdll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\gizmos_xrcdll.lbc library %i
@%append $(OBJS)\gizmos_xrcdll.lbc option resource=$(OBJS)\gizmos_xrcdll_version.res
@%append $(OBJS)\gizmos_xrcdll.lbc system nt_dll
@for %i in ( $(__WXLIB_MONO_p) $(__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)_gizmos.lib $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\gizmos_xrcdll.lbc library %i
@%append $(OBJS)\gizmos_xrcdll.lbc
@%append $(OBJS)\gizmos_xrcdll.lbc system os2v2 dll
wlink @$(OBJS)\gizmos_xrcdll.lbc
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib +$^@
!endif
@@ -402,62 +383,56 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!endif
$(OBJS)\gizmosdll_dummy.obj : .AUTODEPEND ..\..\src\gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_version.res : .AUTODEPEND ..\..\src\gizmos\..\..\..\src\msw\version.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\gizmos\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_wat$(VENDORTAG) -i=..\..\src\gizmos\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_GIZMOS $<
$(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_dynamicsash.obj : .AUTODEPEND ..\..\src\gizmos\dynamicsash.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_editlbox.obj : .AUTODEPEND ..\..\src\gizmos\editlbox.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_ledctrl.obj : .AUTODEPEND ..\..\src\gizmos\ledctrl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_multicell.obj : .AUTODEPEND ..\..\src\gizmos\multicell.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_splittree.obj : .AUTODEPEND ..\..\src\gizmos\splittree.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_statpict.obj : .AUTODEPEND ..\..\src\gizmos\statpict.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmos_xrcdll_dummy.obj : .AUTODEPEND ..\..\src\gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOS_XRCDLL_CXXFLAGS) $<
$(OBJS)\gizmos_xrcdll_version.res : .AUTODEPEND ..\..\src\gizmos\..\..\..\src\msw\version.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\gizmos\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_wat$(VENDORTAG) -i=..\..\src\gizmos\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_GIZMOS_XRC $<
$(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOS_XRCDLL_CXXFLAGS) $<
$(OBJS)\gizmos_xrcdll_xh_statpict.obj : .AUTODEPEND ..\..\src\gizmos\xh_statpict.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOS_XRCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOS_XRCDLL_CXXFLAGS) $<
$(OBJS)\gizmoslib_dummy.obj : .AUTODEPEND ..\..\src\gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_dynamicsash.obj : .AUTODEPEND ..\..\src\gizmos\dynamicsash.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_editlbox.obj : .AUTODEPEND ..\..\src\gizmos\editlbox.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_ledctrl.obj : .AUTODEPEND ..\..\src\gizmos\ledctrl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_multicell.obj : .AUTODEPEND ..\..\src\gizmos\multicell.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_splittree.obj : .AUTODEPEND ..\..\src\gizmos\splittree.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_statpict.obj : .AUTODEPEND ..\..\src\gizmos\statpict.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmos_xrclib_dummy.obj : .AUTODEPEND ..\..\src\gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOS_XRCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOS_XRCLIB_CXXFLAGS) $<
$(OBJS)\gizmos_xrclib_xh_statpict.obj : .AUTODEPEND ..\..\src\gizmos\xh_statpict.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOS_XRCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOS_XRCLIB_CXXFLAGS) $<

View File

@@ -4,7 +4,7 @@
# Do not modify, all changes will be overwritten!
# =========================================================================
!include ../../../build/msw/config.wat
!include ../../../build/os2/config.wat
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
@@ -36,14 +36,7 @@ PORTNAME =
PORTNAME = base
!endif
!ifeq USE_GUI 1
PORTNAME = msw
!endif
VENDORTAG =
!ifeq OFFICIAL_BUILD 0
VENDORTAG = _$(VENDOR)
!endif
!ifeq OFFICIAL_BUILD 1
VENDORTAG =
PORTNAME = pm
!endif
WXDEBUGFLAG =
!ifeq BUILD debug
@@ -68,10 +61,10 @@ WXDLLFLAG = dll
!endif
LIBTYPE_SUFFIX =
!ifeq SHARED 0
LIBTYPE_SUFFIX = lib
LIBTYPE_SUFFIX = pm_lib
!endif
!ifeq SHARED 1
LIBTYPE_SUFFIX = dll
LIBTYPE_SUFFIX = pm_dll
!endif
EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 0
@@ -83,7 +76,7 @@ EXTRALIBS_FOR_BASE =
__mmediadll___depname =
!ifeq SHARED 1
__mmediadll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG).dll
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.dll
!endif
__DEBUGINFO_2 =
!ifeq BUILD debug
@@ -119,18 +112,6 @@ __LIB_PNG_p =
!ifeq USE_GUI 1
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
__GDIPLUS_LIB_p =
!ifeq USE_GDIPLUS 1
__GDIPLUS_LIB_p = gdiplus.lib
!endif
__CAIRO_LIB_p =
!ifeq USE_CAIRO 1
__CAIRO_LIB_p = cairo.lib
!endif
____CAIRO_LIBDIR_FILENAMES_p =
!ifeq USE_CAIRO 1
____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib
!endif
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
@@ -249,7 +230,7 @@ LIBDIRNAME = ..\..\src\mmedia\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
MMEDIADLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\mmedia\..\..\..\include &
@@ -259,9 +240,6 @@ MMEDIADLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
MMEDIADLL_OBJECTS = &
$(OBJS)\mmediadll_dummy.obj &
$(OBJS)\mmediadll_cdwin.obj &
$(OBJS)\mmediadll_sndwin.obj &
$(OBJS)\mmediadll_vidwin.obj &
$(OBJS)\mmediadll_cdbase.obj &
$(OBJS)\mmediadll_g711.obj &
$(OBJS)\mmediadll_g721.obj &
@@ -280,7 +258,7 @@ MMEDIADLL_OBJECTS = &
$(OBJS)\mmediadll_sndwav.obj &
$(OBJS)\mmediadll_vidbase.obj
MMEDIALIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\mmedia\..\..\..\include &
@@ -290,9 +268,6 @@ MMEDIALIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(CPPFLAGS) $(CXXFLAGS)
MMEDIALIB_OBJECTS = &
$(OBJS)\mmedialib_dummy.obj &
$(OBJS)\mmedialib_cdwin.obj &
$(OBJS)\mmedialib_sndwin.obj &
$(OBJS)\mmedialib_vidwin.obj &
$(OBJS)\mmedialib_cdbase.obj &
$(OBJS)\mmedialib_g711.obj &
$(OBJS)\mmedialib_g721.obj &
@@ -326,21 +301,21 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.dll
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib
!ifeq SHARED 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG).dll : $(MMEDIADLL_OBJECTS) $(OBJS)\mmediadll_version.res
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.dll : $(MMEDIADLL_OBJECTS)
@%create $(OBJS)\mmediadll.lbc
@%append $(OBJS)\mmediadll.lbc option quiet
@%append $(OBJS)\mmediadll.lbc name $^@
@%append $(OBJS)\mmediadll.lbc option caseexact
@%append $(OBJS)\mmediadll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@%append $(OBJS)\mmediadll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(MMEDIADLL_OBJECTS)) do @%append $(OBJS)\mmediadll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\mmediadll.lbc library %i
@%append $(OBJS)\mmediadll.lbc option resource=$(OBJS)\mmediadll_version.res
@%append $(OBJS)\mmediadll.lbc system nt_dll
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\mmediadll.lbc library %i
@%append $(OBJS)\mmediadll.lbc
@%append $(OBJS)\mmediadll.lbc system os2v2 dll
wlink @$(OBJS)\mmediadll.lbc
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib +$^@
!endif
@@ -353,131 +328,110 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!endif
$(OBJS)\mmediadll_dummy.obj : .AUTODEPEND ..\..\src\mmedia\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_version.res : .AUTODEPEND ..\..\src\mmedia\..\..\..\src\msw\version.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\mmedia\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG) -i=..\..\src\mmedia\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_MMEDIA $<
$(OBJS)\mmediadll_cdwin.obj : .AUTODEPEND ..\..\src\mmedia\cdwin.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndwin.obj : .AUTODEPEND ..\..\src\mmedia\sndwin.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_vidwin.obj : .AUTODEPEND ..\..\src\mmedia\vidwin.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_cdbase.obj : .AUTODEPEND ..\..\src\mmedia\cdbase.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_g711.obj : .AUTODEPEND ..\..\src\mmedia\g711.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_g721.obj : .AUTODEPEND ..\..\src\mmedia\g721.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_g723_24.obj : .AUTODEPEND ..\..\src\mmedia\g723_24.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_g723_40.obj : .AUTODEPEND ..\..\src\mmedia\g723_40.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_g72x.obj : .AUTODEPEND ..\..\src\mmedia\g72x.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndaiff.obj : .AUTODEPEND ..\..\src\mmedia\sndaiff.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndbase.obj : .AUTODEPEND ..\..\src\mmedia\sndbase.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndcodec.obj : .AUTODEPEND ..\..\src\mmedia\sndcodec.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndcpcm.obj : .AUTODEPEND ..\..\src\mmedia\sndcpcm.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndfile.obj : .AUTODEPEND ..\..\src\mmedia\sndfile.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndg72x.obj : .AUTODEPEND ..\..\src\mmedia\sndg72x.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndmsad.obj : .AUTODEPEND ..\..\src\mmedia\sndmsad.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndpcm.obj : .AUTODEPEND ..\..\src\mmedia\sndpcm.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndulaw.obj : .AUTODEPEND ..\..\src\mmedia\sndulaw.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndwav.obj : .AUTODEPEND ..\..\src\mmedia\sndwav.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_vidbase.obj : .AUTODEPEND ..\..\src\mmedia\vidbase.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmedialib_dummy.obj : .AUTODEPEND ..\..\src\mmedia\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_cdwin.obj : .AUTODEPEND ..\..\src\mmedia\cdwin.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndwin.obj : .AUTODEPEND ..\..\src\mmedia\sndwin.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_vidwin.obj : .AUTODEPEND ..\..\src\mmedia\vidwin.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_cdbase.obj : .AUTODEPEND ..\..\src\mmedia\cdbase.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_g711.obj : .AUTODEPEND ..\..\src\mmedia\g711.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_g721.obj : .AUTODEPEND ..\..\src\mmedia\g721.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_g723_24.obj : .AUTODEPEND ..\..\src\mmedia\g723_24.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_g723_40.obj : .AUTODEPEND ..\..\src\mmedia\g723_40.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_g72x.obj : .AUTODEPEND ..\..\src\mmedia\g72x.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndaiff.obj : .AUTODEPEND ..\..\src\mmedia\sndaiff.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndbase.obj : .AUTODEPEND ..\..\src\mmedia\sndbase.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndcodec.obj : .AUTODEPEND ..\..\src\mmedia\sndcodec.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndcpcm.obj : .AUTODEPEND ..\..\src\mmedia\sndcpcm.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndfile.obj : .AUTODEPEND ..\..\src\mmedia\sndfile.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndg72x.obj : .AUTODEPEND ..\..\src\mmedia\sndg72x.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndmsad.obj : .AUTODEPEND ..\..\src\mmedia\sndmsad.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndpcm.obj : .AUTODEPEND ..\..\src\mmedia\sndpcm.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndulaw.obj : .AUTODEPEND ..\..\src\mmedia\sndulaw.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndwav.obj : .AUTODEPEND ..\..\src\mmedia\sndwav.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_vidbase.obj : .AUTODEPEND ..\..\src\mmedia\vidbase.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<

View File

@@ -4,7 +4,7 @@
# Do not modify, all changes will be overwritten!
# =========================================================================
!include ../../../build/msw/config.wat
!include ../../../build/os2/config.wat
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
@@ -36,14 +36,7 @@ PORTNAME =
PORTNAME = base
!endif
!ifeq USE_GUI 1
PORTNAME = msw
!endif
VENDORTAG =
!ifeq OFFICIAL_BUILD 0
VENDORTAG = _$(VENDOR)
!endif
!ifeq OFFICIAL_BUILD 1
VENDORTAG =
PORTNAME = pm
!endif
WXDEBUGFLAG =
!ifeq BUILD debug
@@ -68,10 +61,10 @@ WXDLLFLAG = dll
!endif
LIBTYPE_SUFFIX =
!ifeq SHARED 0
LIBTYPE_SUFFIX = lib
LIBTYPE_SUFFIX = pm_lib
!endif
!ifeq SHARED 1
LIBTYPE_SUFFIX = dll
LIBTYPE_SUFFIX = pm_dll
!endif
EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 0
@@ -83,7 +76,7 @@ EXTRALIBS_FOR_BASE =
__netutilsdll___depname =
!ifeq SHARED 1
__netutilsdll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.dll
!endif
__DEBUGINFO_2 =
!ifeq BUILD debug
@@ -119,18 +112,6 @@ __LIB_PNG_p =
!ifeq USE_GUI 1
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
__GDIPLUS_LIB_p =
!ifeq USE_GDIPLUS 1
__GDIPLUS_LIB_p = gdiplus.lib
!endif
__CAIRO_LIB_p =
!ifeq USE_CAIRO 1
__CAIRO_LIB_p = cairo.lib
!endif
____CAIRO_LIBDIR_FILENAMES_p =
!ifeq USE_CAIRO 1
____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib
!endif
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
@@ -249,7 +230,7 @@ LIBDIRNAME = ..\..\src\net\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
NETUTILSDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\net\..\..\..\include &
@@ -263,7 +244,7 @@ NETUTILSDLL_OBJECTS = &
$(OBJS)\netutilsdll_smapi.obj &
$(OBJS)\netutilsdll_web.obj
NETUTILSLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\net\..\..\..\include &
@@ -292,21 +273,21 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.dll
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib
!ifeq SHARED 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll : $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_version.res
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.dll : $(NETUTILSDLL_OBJECTS)
@%create $(OBJS)\netutilsdll.lbc
@%append $(OBJS)\netutilsdll.lbc option quiet
@%append $(OBJS)\netutilsdll.lbc name $^@
@%append $(OBJS)\netutilsdll.lbc option caseexact
@%append $(OBJS)\netutilsdll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@%append $(OBJS)\netutilsdll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(NETUTILSDLL_OBJECTS)) do @%append $(OBJS)\netutilsdll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\netutilsdll.lbc library %i
@%append $(OBJS)\netutilsdll.lbc option resource=$(OBJS)\netutilsdll_version.res
@%append $(OBJS)\netutilsdll.lbc system nt_dll
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\netutilsdll.lbc library %i
@%append $(OBJS)\netutilsdll.lbc
@%append $(OBJS)\netutilsdll.lbc system os2v2 dll
wlink @$(OBJS)\netutilsdll.lbc
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib +$^@
!endif
@@ -319,29 +300,26 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!endif
$(OBJS)\netutilsdll_dummy.obj : .AUTODEPEND ..\..\src\net\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
$(OBJS)\netutilsdll_version.res : .AUTODEPEND ..\..\src\net\..\..\..\src\msw\version.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\net\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG) -i=..\..\src\net\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_NETUTILS $<
$(CXX) -bt=os2 -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
$(OBJS)\netutilsdll_email.obj : .AUTODEPEND ..\..\src\net\email.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
$(OBJS)\netutilsdll_smapi.obj : .AUTODEPEND ..\..\src\net\smapi.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
$(OBJS)\netutilsdll_web.obj : .AUTODEPEND ..\..\src\net\web.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
$(OBJS)\netutilslib_dummy.obj : .AUTODEPEND ..\..\src\net\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
$(OBJS)\netutilslib_email.obj : .AUTODEPEND ..\..\src\net\email.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
$(OBJS)\netutilslib_smapi.obj : .AUTODEPEND ..\..\src\net\smapi.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
$(OBJS)\netutilslib_web.obj : .AUTODEPEND ..\..\src\net\web.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<

View File

@@ -4,7 +4,7 @@
# Do not modify, all changes will be overwritten!
# =========================================================================
!include ../../../build/msw/config.wat
!include ../../../build/os2/config.wat
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
@@ -36,14 +36,7 @@ PORTNAME =
PORTNAME = base
!endif
!ifeq USE_GUI 1
PORTNAME = msw
!endif
VENDORTAG =
!ifeq OFFICIAL_BUILD 0
VENDORTAG = _$(VENDOR)
!endif
!ifeq OFFICIAL_BUILD 1
VENDORTAG =
PORTNAME = pm
!endif
WXDEBUGFLAG =
!ifeq BUILD debug
@@ -68,10 +61,10 @@ WXDLLFLAG = dll
!endif
LIBTYPE_SUFFIX =
!ifeq SHARED 0
LIBTYPE_SUFFIX = lib
LIBTYPE_SUFFIX = pm_lib
!endif
!ifeq SHARED 1
LIBTYPE_SUFFIX = dll
LIBTYPE_SUFFIX = pm_dll
!endif
EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 0
@@ -83,7 +76,7 @@ EXTRALIBS_FOR_BASE =
__ogldll___depname =
!ifeq SHARED 1
__ogldll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.dll
!endif
__DEBUGINFO_2 =
!ifeq BUILD debug
@@ -119,18 +112,6 @@ __LIB_PNG_p =
!ifeq USE_GUI 1
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
__GDIPLUS_LIB_p =
!ifeq USE_GDIPLUS 1
__GDIPLUS_LIB_p = gdiplus.lib
!endif
__CAIRO_LIB_p =
!ifeq USE_CAIRO 1
__CAIRO_LIB_p = cairo.lib
!endif
____CAIRO_LIBDIR_FILENAMES_p =
!ifeq USE_CAIRO 1
____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib
!endif
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
@@ -249,7 +230,7 @@ LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
OGLDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\ogl\..\..\..\include &
@@ -272,7 +253,7 @@ OGLDLL_OBJECTS = &
$(OBJS)\ogldll_lines.obj &
$(OBJS)\ogldll_ogldiag.obj
OGLLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\ogl\..\..\..\include &
@@ -309,21 +290,21 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.dll
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
!ifeq SHARED 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll : $(OGLDLL_OBJECTS) $(OBJS)\ogldll_version.res
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.dll : $(OGLDLL_OBJECTS)
@%create $(OBJS)\ogldll.lbc
@%append $(OBJS)\ogldll.lbc option quiet
@%append $(OBJS)\ogldll.lbc name $^@
@%append $(OBJS)\ogldll.lbc option caseexact
@%append $(OBJS)\ogldll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@%append $(OBJS)\ogldll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(OGLDLL_OBJECTS)) do @%append $(OBJS)\ogldll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\ogldll.lbc library %i
@%append $(OBJS)\ogldll.lbc option resource=$(OBJS)\ogldll_version.res
@%append $(OBJS)\ogldll.lbc system nt_dll
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\ogldll.lbc library %i
@%append $(OBJS)\ogldll.lbc
@%append $(OBJS)\ogldll.lbc system os2v2 dll
wlink @$(OBJS)\ogldll.lbc
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib +$^@
!endif
@@ -336,83 +317,80 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!endif
$(OBJS)\ogldll_dummy.obj : .AUTODEPEND ..\..\src\ogl\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_version.res : .AUTODEPEND ..\..\src\ogl\..\..\..\src\msw\version.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\ogl\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG) -i=..\..\src\ogl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_OGL $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_basic2.obj : .AUTODEPEND ..\..\src\ogl\basic2.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_canvas.obj : .AUTODEPEND ..\..\src\ogl\canvas.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_divided.obj : .AUTODEPEND ..\..\src\ogl\divided.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_mfutils.obj : .AUTODEPEND ..\..\src\ogl\mfutils.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_oglmisc.obj : .AUTODEPEND ..\..\src\ogl\oglmisc.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_basic.obj : .AUTODEPEND ..\..\src\ogl\basic.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_composit.obj : .AUTODEPEND ..\..\src\ogl\composit.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_drawn.obj : .AUTODEPEND ..\..\src\ogl\drawn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_bmpshape.obj : .AUTODEPEND ..\..\src\ogl\bmpshape.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_constrnt.obj : .AUTODEPEND ..\..\src\ogl\constrnt.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_lines.obj : .AUTODEPEND ..\..\src\ogl\lines.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_ogldiag.obj : .AUTODEPEND ..\..\src\ogl\ogldiag.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogllib_dummy.obj : .AUTODEPEND ..\..\src\ogl\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_basic2.obj : .AUTODEPEND ..\..\src\ogl\basic2.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_canvas.obj : .AUTODEPEND ..\..\src\ogl\canvas.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_divided.obj : .AUTODEPEND ..\..\src\ogl\divided.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_mfutils.obj : .AUTODEPEND ..\..\src\ogl\mfutils.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_oglmisc.obj : .AUTODEPEND ..\..\src\ogl\oglmisc.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_basic.obj : .AUTODEPEND ..\..\src\ogl\basic.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_composit.obj : .AUTODEPEND ..\..\src\ogl\composit.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_drawn.obj : .AUTODEPEND ..\..\src\ogl\drawn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_bmpshape.obj : .AUTODEPEND ..\..\src\ogl\bmpshape.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_constrnt.obj : .AUTODEPEND ..\..\src\ogl\constrnt.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_lines.obj : .AUTODEPEND ..\..\src\ogl\lines.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_ogldiag.obj : .AUTODEPEND ..\..\src\ogl\ogldiag.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<

View File

@@ -4,7 +4,7 @@
# Do not modify, all changes will be overwritten!
# =========================================================================
!include ../../../build/msw/config.wat
!include ../../../build/os2/config.wat
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
@@ -36,14 +36,7 @@ PORTNAME =
PORTNAME = base
!endif
!ifeq USE_GUI 1
PORTNAME = msw
!endif
VENDORTAG =
!ifeq OFFICIAL_BUILD 0
VENDORTAG = _$(VENDOR)
!endif
!ifeq OFFICIAL_BUILD 1
VENDORTAG =
PORTNAME = pm
!endif
WXDEBUGFLAG =
!ifeq BUILD debug
@@ -68,10 +61,10 @@ WXDLLFLAG = dll
!endif
LIBTYPE_SUFFIX =
!ifeq SHARED 0
LIBTYPE_SUFFIX = lib
LIBTYPE_SUFFIX = pm_lib
!endif
!ifeq SHARED 1
LIBTYPE_SUFFIX = dll
LIBTYPE_SUFFIX = pm_dll
!endif
EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 0
@@ -83,7 +76,7 @@ EXTRALIBS_FOR_BASE =
__plotdll___depname =
!ifeq SHARED 1
__plotdll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG).dll
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.dll
!endif
__DEBUGINFO_2 =
!ifeq BUILD debug
@@ -119,18 +112,6 @@ __LIB_PNG_p =
!ifeq USE_GUI 1
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
__GDIPLUS_LIB_p =
!ifeq USE_GDIPLUS 1
__GDIPLUS_LIB_p = gdiplus.lib
!endif
__CAIRO_LIB_p =
!ifeq USE_CAIRO 1
__CAIRO_LIB_p = cairo.lib
!endif
____CAIRO_LIBDIR_FILENAMES_p =
!ifeq USE_CAIRO 1
____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib
!endif
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
@@ -249,7 +230,7 @@ LIBDIRNAME = ..\..\src\plot\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
PLOTDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\plot\..\..\..\include &
@@ -261,7 +242,7 @@ PLOTDLL_OBJECTS = &
$(OBJS)\plotdll_dummy.obj &
$(OBJS)\plotdll_plot.obj
PLOTLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\plot\..\..\..\include &
@@ -288,21 +269,21 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.dll
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib
!ifeq SHARED 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG).dll : $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_version.res
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.dll : $(PLOTDLL_OBJECTS)
@%create $(OBJS)\plotdll.lbc
@%append $(OBJS)\plotdll.lbc option quiet
@%append $(OBJS)\plotdll.lbc name $^@
@%append $(OBJS)\plotdll.lbc option caseexact
@%append $(OBJS)\plotdll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@%append $(OBJS)\plotdll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(PLOTDLL_OBJECTS)) do @%append $(OBJS)\plotdll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\plotdll.lbc library %i
@%append $(OBJS)\plotdll.lbc option resource=$(OBJS)\plotdll_version.res
@%append $(OBJS)\plotdll.lbc system nt_dll
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\plotdll.lbc library %i
@%append $(OBJS)\plotdll.lbc
@%append $(OBJS)\plotdll.lbc system os2v2 dll
wlink @$(OBJS)\plotdll.lbc
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib +$^@
!endif
@@ -315,17 +296,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!endif
$(OBJS)\plotdll_dummy.obj : .AUTODEPEND ..\..\src\plot\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $<
$(OBJS)\plotdll_version.res : .AUTODEPEND ..\..\src\plot\..\..\..\src\msw\version.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\plot\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG) -i=..\..\src\plot\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_PLOT $<
$(CXX) -bt=os2 -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $<
$(OBJS)\plotdll_plot.obj : .AUTODEPEND ..\..\src\plot\plot.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $<
$(OBJS)\plotlib_dummy.obj : .AUTODEPEND ..\..\src\plot\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(PLOTLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(PLOTLIB_CXXFLAGS) $<
$(OBJS)\plotlib_plot.obj : .AUTODEPEND ..\..\src\plot\plot.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(PLOTLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(PLOTLIB_CXXFLAGS) $<

View File

@@ -4,7 +4,7 @@
# Do not modify, all changes will be overwritten!
# =========================================================================
!include ../../../build/msw/config.wat
!include ../../../build/os2/config.wat
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
@@ -36,14 +36,7 @@ PORTNAME =
PORTNAME = base
!endif
!ifeq USE_GUI 1
PORTNAME = msw
!endif
VENDORTAG =
!ifeq OFFICIAL_BUILD 0
VENDORTAG = _$(VENDOR)
!endif
!ifeq OFFICIAL_BUILD 1
VENDORTAG =
PORTNAME = pm
!endif
WXDEBUGFLAG =
!ifeq BUILD debug
@@ -68,10 +61,10 @@ WXDLLFLAG = dll
!endif
LIBTYPE_SUFFIX =
!ifeq SHARED 0
LIBTYPE_SUFFIX = lib
LIBTYPE_SUFFIX = pm_lib
!endif
!ifeq SHARED 1
LIBTYPE_SUFFIX = dll
LIBTYPE_SUFFIX = pm_dll
!endif
EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 0
@@ -83,7 +76,7 @@ EXTRALIBS_FOR_BASE =
__stcdll___depname =
!ifeq SHARED 1
__stcdll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_wat$(VENDORTAG).dll
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.dll
!endif
__DEBUGINFO_2 =
!ifeq BUILD debug
@@ -119,18 +112,6 @@ __LIB_PNG_p =
!ifeq USE_GUI 1
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
__GDIPLUS_LIB_p =
!ifeq USE_GDIPLUS 1
__GDIPLUS_LIB_p = gdiplus.lib
!endif
__CAIRO_LIB_p =
!ifeq USE_CAIRO 1
__CAIRO_LIB_p = cairo.lib
!endif
____CAIRO_LIBDIR_FILENAMES_p =
!ifeq USE_CAIRO 1
____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib
!endif
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
@@ -249,7 +230,7 @@ LIBDIRNAME = ..\..\src\stc\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
STCDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\stc\..\..\..\include &
@@ -344,7 +325,7 @@ STCDLL_OBJECTS = &
$(OBJS)\stcdll_WindowAccessor.obj &
$(OBJS)\stcdll_XPM.obj
STCLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\stc\..\..\..\include &
@@ -454,21 +435,21 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_wat$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.dll
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
!ifeq SHARED 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_wat$(VENDORTAG).dll : $(STCDLL_OBJECTS) $(OBJS)\stcdll_version.res
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.dll : $(STCDLL_OBJECTS)
@%create $(OBJS)\stcdll.lbc
@%append $(OBJS)\stcdll.lbc option quiet
@%append $(OBJS)\stcdll.lbc name $^@
@%append $(OBJS)\stcdll.lbc option caseexact
@%append $(OBJS)\stcdll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@%append $(OBJS)\stcdll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(STCDLL_OBJECTS)) do @%append $(OBJS)\stcdll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\stcdll.lbc library %i
@%append $(OBJS)\stcdll.lbc option resource=$(OBJS)\stcdll_version.res
@%append $(OBJS)\stcdll.lbc system nt_dll
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\stcdll.lbc library %i
@%append $(OBJS)\stcdll.lbc
@%append $(OBJS)\stcdll.lbc system os2v2 dll
wlink @$(OBJS)\stcdll.lbc
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib +$^@
!endif
@@ -481,509 +462,506 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!endif
$(OBJS)\stcdll_PlatWX.obj : .AUTODEPEND ..\..\src\stc\PlatWX.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_ScintillaWX.obj : .AUTODEPEND ..\..\src\stc\ScintillaWX.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_AutoComplete.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\AutoComplete.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_CallTip.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CallTip.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_CellBuffer.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CellBuffer.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_CharClassify.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CharClassify.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_ContractionState.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ContractionState.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_Document.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Document.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_DocumentAccessor.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\DocumentAccessor.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_Editor.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Editor.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_ExternalLexer.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ExternalLexer.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_Indicator.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Indicator.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_KeyMap.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\KeyMap.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_KeyWords.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\KeyWords.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexAPDL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAPDL.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexAU3.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAU3.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexAVE.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAVE.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexAda.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAda.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexAsm.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAsm.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexAsn1.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAsn1.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexBaan.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBaan.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexBash.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBash.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexBasic.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBasic.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexBullant.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBullant.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexCLW.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCLW.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexCPP.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCPP.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexCSS.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCSS.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexCaml.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCaml.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexCsound.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCsound.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexConf.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexConf.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexCrontab.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCrontab.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexEScript.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexEScript.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexEiffel.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexEiffel.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexErlang.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexErlang.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexFlagship.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexFlagship.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexForth.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexForth.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexFortran.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexFortran.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexGui4Cli.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexGui4Cli.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexHTML.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexHTML.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexHaskell.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexHaskell.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexInno.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexInno.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexKix.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexKix.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexLisp.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexLisp.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexLout.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexLout.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexLua.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexLua.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexMMIXAL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMMIXAL.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexMPT.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMPT.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexMSSQL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMSSQL.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexMatlab.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMatlab.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexMetapost.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMetapost.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexNsis.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexNsis.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexOpal.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexOpal.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexOthers.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexOthers.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexPB.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPB.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexPOV.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPOV.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexPS.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPS.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexPascal.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPascal.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexPerl.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPerl.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexPython.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPython.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexRebol.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexRebol.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexRuby.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexRuby.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexSQL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSQL.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexSmalltalk.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSmalltalk.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexTADS3.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexTADS3.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexScriptol.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexScriptol.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexSpecman.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSpecman.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexSpice.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSpice.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexTCL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexTCL.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexTeX.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexTeX.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexVB.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexVB.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexVHDL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexVHDL.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexVerilog.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexVerilog.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LexYAML.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexYAML.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_LineMarker.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LineMarker.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_PropSet.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\PropSet.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_RESearch.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\RESearch.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_ScintillaBase.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ScintillaBase.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_Style.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Style.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_StyleContext.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\StyleContext.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_UniConversion.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\UniConversion.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_ViewStyle.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ViewStyle.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_WindowAccessor.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\WindowAccessor.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_XPM.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\XPM.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stcdll_version.res : .AUTODEPEND ..\..\src\stc\..\..\..\src\msw\version.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\stc\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_wat$(VENDORTAG) -i=..\..\src\stc\..\..\include -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dWXUSINGDLL -dWXMAKINGDLL_STC $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
$(OBJS)\stclib_PlatWX.obj : .AUTODEPEND ..\..\src\stc\PlatWX.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_ScintillaWX.obj : .AUTODEPEND ..\..\src\stc\ScintillaWX.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_AutoComplete.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\AutoComplete.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_CallTip.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CallTip.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_CellBuffer.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CellBuffer.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_CharClassify.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CharClassify.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_ContractionState.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ContractionState.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_Document.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Document.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_DocumentAccessor.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\DocumentAccessor.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_Editor.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Editor.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_ExternalLexer.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ExternalLexer.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_Indicator.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Indicator.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_KeyMap.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\KeyMap.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_KeyWords.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\KeyWords.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexAPDL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAPDL.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexAU3.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAU3.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexAVE.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAVE.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexAda.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAda.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexAsm.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAsm.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexAsn1.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAsn1.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexBaan.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBaan.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexBash.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBash.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexBasic.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBasic.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexBullant.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBullant.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexCLW.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCLW.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexCPP.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCPP.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexCSS.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCSS.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexCaml.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCaml.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexCsound.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCsound.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexConf.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexConf.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexCrontab.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCrontab.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexEScript.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexEScript.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexEiffel.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexEiffel.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexErlang.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexErlang.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexFlagship.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexFlagship.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexForth.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexForth.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexFortran.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexFortran.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexGui4Cli.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexGui4Cli.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexHTML.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexHTML.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexHaskell.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexHaskell.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexInno.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexInno.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexKix.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexKix.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexLisp.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexLisp.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexLout.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexLout.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexLua.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexLua.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexMMIXAL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMMIXAL.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexMPT.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMPT.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexMSSQL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMSSQL.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexMatlab.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMatlab.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexMetapost.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMetapost.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexNsis.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexNsis.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexOpal.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexOpal.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexOthers.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexOthers.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexPB.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPB.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexPOV.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPOV.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexPS.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPS.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexPascal.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPascal.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexPerl.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPerl.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexPython.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPython.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexRebol.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexRebol.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexRuby.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexRuby.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexSQL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSQL.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexSmalltalk.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSmalltalk.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexTADS3.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexTADS3.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexScriptol.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexScriptol.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexSpecman.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSpecman.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexSpice.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSpice.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexTCL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexTCL.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexTeX.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexTeX.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexVB.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexVB.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexVHDL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexVHDL.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexVerilog.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexVerilog.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LexYAML.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexYAML.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_LineMarker.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LineMarker.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_PropSet.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\PropSet.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_RESearch.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\RESearch.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_ScintillaBase.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ScintillaBase.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_Style.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Style.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_StyleContext.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\StyleContext.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_UniConversion.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\UniConversion.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_ViewStyle.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ViewStyle.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_WindowAccessor.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\WindowAccessor.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(OBJS)\stclib_XPM.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\XPM.cxx
$(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<

View File

@@ -4,7 +4,7 @@
# Do not modify, all changes will be overwritten!
# =========================================================================
!include ../../../build/msw/config.wat
!include ../../../build/os2/config.wat
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
@@ -36,14 +36,7 @@ PORTNAME =
PORTNAME = base
!endif
!ifeq USE_GUI 1
PORTNAME = msw
!endif
VENDORTAG =
!ifeq OFFICIAL_BUILD 0
VENDORTAG = _$(VENDOR)
!endif
!ifeq OFFICIAL_BUILD 1
VENDORTAG =
PORTNAME = pm
!endif
WXDEBUGFLAG =
!ifeq BUILD debug
@@ -68,10 +61,10 @@ WXDLLFLAG = dll
!endif
LIBTYPE_SUFFIX =
!ifeq SHARED 0
LIBTYPE_SUFFIX = lib
LIBTYPE_SUFFIX = pm_lib
!endif
!ifeq SHARED 1
LIBTYPE_SUFFIX = dll
LIBTYPE_SUFFIX = pm_dll
!endif
EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 0
@@ -83,7 +76,7 @@ EXTRALIBS_FOR_BASE =
__svgdll___depname =
!ifeq SHARED 1
__svgdll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_wat$(VENDORTAG).dll
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.dll
!endif
__DEBUGINFO_2 =
!ifeq BUILD debug
@@ -119,18 +112,6 @@ __LIB_PNG_p =
!ifeq USE_GUI 1
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
__GDIPLUS_LIB_p =
!ifeq USE_GDIPLUS 1
__GDIPLUS_LIB_p = gdiplus.lib
!endif
__CAIRO_LIB_p =
!ifeq USE_CAIRO 1
__CAIRO_LIB_p = cairo.lib
!endif
____CAIRO_LIBDIR_FILENAMES_p =
!ifeq USE_CAIRO 1
____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib
!endif
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
@@ -249,7 +230,7 @@ LIBDIRNAME = ..\..\src\svg\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
SVGDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\svg\..\..\..\include &
@@ -261,7 +242,7 @@ SVGDLL_OBJECTS = &
$(OBJS)\svgdll_dummy.obj &
$(OBJS)\svgdll_dcsvg.obj
SVGLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\svg\..\..\..\include &
@@ -287,21 +268,21 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_wat$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.dll
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib
!ifeq SHARED 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_wat$(VENDORTAG).dll : $(SVGDLL_OBJECTS) $(OBJS)\svgdll_version.res
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.dll : $(SVGDLL_OBJECTS)
@%create $(OBJS)\svgdll.lbc
@%append $(OBJS)\svgdll.lbc option quiet
@%append $(OBJS)\svgdll.lbc name $^@
@%append $(OBJS)\svgdll.lbc option caseexact
@%append $(OBJS)\svgdll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@%append $(OBJS)\svgdll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(SVGDLL_OBJECTS)) do @%append $(OBJS)\svgdll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\svgdll.lbc library %i
@%append $(OBJS)\svgdll.lbc option resource=$(OBJS)\svgdll_version.res
@%append $(OBJS)\svgdll.lbc system nt_dll
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\svgdll.lbc library %i
@%append $(OBJS)\svgdll.lbc
@%append $(OBJS)\svgdll.lbc system os2v2 dll
wlink @$(OBJS)\svgdll.lbc
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib +$^@
!endif
@@ -314,17 +295,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!endif
$(OBJS)\svgdll_dummy.obj : .AUTODEPEND ..\..\src\svg\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(SVGDLL_CXXFLAGS) $<
$(OBJS)\svgdll_version.res : .AUTODEPEND ..\..\src\svg\..\..\..\src\msw\version.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\svg\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_wat$(VENDORTAG) -i=..\..\src\svg\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_SVG $<
$(CXX) -bt=os2 -zq -fo=$^@ $(SVGDLL_CXXFLAGS) $<
$(OBJS)\svgdll_dcsvg.obj : .AUTODEPEND ..\..\src\svg\dcsvg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(SVGDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(SVGDLL_CXXFLAGS) $<
$(OBJS)\svglib_dummy.obj : .AUTODEPEND ..\..\src\svg\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(SVGLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(SVGLIB_CXXFLAGS) $<
$(OBJS)\svglib_dcsvg.obj : .AUTODEPEND ..\..\src\svg\dcsvg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(SVGLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(SVGLIB_CXXFLAGS) $<