Don't need penwin.cpp

[wxWidgets.git] / build / msw / makefile.wat

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 4601c9903bd4d203e694900fb3d39a965a8e3cd5..4dd05544c055c3a4f2cfa3b119dfe89f2b3cc79d 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -396,7 +396,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_utilsgui.obj &
        $(OBJS)\monolib_uxtheme.obj &
        $(OBJS)\monolib_window.obj &
        $(OBJS)\monolib_utilsgui.obj &
        $(OBJS)\monolib_uxtheme.obj &
        $(OBJS)\monolib_window.obj &

-       $(OBJS)\monolib_textctrl.obj &

        $(OBJS)\monolib_accel.obj &
        $(OBJS)\monolib_colrdlgg.obj &
        $(OBJS)\monolib_dirdlgg.obj &
        $(OBJS)\monolib_accel.obj &
        $(OBJS)\monolib_colrdlgg.obj &
        $(OBJS)\monolib_dirdlgg.obj &


@@ -438,6 +437,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_statline.obj &
        $(OBJS)\monolib_stattext.obj &
        $(OBJS)\monolib_statusbr.obj &
        $(OBJS)\monolib_statline.obj &
        $(OBJS)\monolib_stattext.obj &
        $(OBJS)\monolib_statusbr.obj &

+       $(OBJS)\monolib_textctrl.obj &

        $(OBJS)\monolib_theme.obj &
        $(OBJS)\monolib_toolbar.obj &
        $(OBJS)\monolib_topluniv.obj &
        $(OBJS)\monolib_theme.obj &
        $(OBJS)\monolib_toolbar.obj &
        $(OBJS)\monolib_topluniv.obj &


@@ -781,7 +781,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_utilsgui.obj &
        $(OBJS)\coredll_uxtheme.obj &
        $(OBJS)\coredll_window.obj &
        $(OBJS)\coredll_utilsgui.obj &
        $(OBJS)\coredll_uxtheme.obj &
        $(OBJS)\coredll_window.obj &

-       $(OBJS)\coredll_textctrl.obj &

        $(OBJS)\coredll_accel.obj &
        $(OBJS)\coredll_colrdlgg.obj &
        $(OBJS)\coredll_dirdlgg.obj &
        $(OBJS)\coredll_accel.obj &
        $(OBJS)\coredll_colrdlgg.obj &
        $(OBJS)\coredll_dirdlgg.obj &


@@ -823,6 +822,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_statline.obj &
        $(OBJS)\coredll_stattext.obj &
        $(OBJS)\coredll_statusbr.obj &
        $(OBJS)\coredll_statline.obj &
        $(OBJS)\coredll_stattext.obj &
        $(OBJS)\coredll_statusbr.obj &

+       $(OBJS)\coredll_textctrl.obj &

        $(OBJS)\coredll_theme.obj &
        $(OBJS)\coredll_toolbar.obj &
        $(OBJS)\coredll_topluniv.obj &
        $(OBJS)\coredll_theme.obj &
        $(OBJS)\coredll_toolbar.obj &
        $(OBJS)\coredll_topluniv.obj &


@@ -1166,7 +1166,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_utilsgui.obj &
        $(OBJS)\corelib_uxtheme.obj &
        $(OBJS)\corelib_window.obj &
        $(OBJS)\corelib_utilsgui.obj &
        $(OBJS)\corelib_uxtheme.obj &
        $(OBJS)\corelib_window.obj &

-       $(OBJS)\corelib_textctrl.obj &

        $(OBJS)\corelib_accel.obj &
        $(OBJS)\corelib_colrdlgg.obj &
        $(OBJS)\corelib_dirdlgg.obj &
        $(OBJS)\corelib_accel.obj &
        $(OBJS)\corelib_colrdlgg.obj &
        $(OBJS)\corelib_dirdlgg.obj &


@@ -1208,6 +1207,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_statline.obj &
        $(OBJS)\corelib_stattext.obj &
        $(OBJS)\corelib_statusbr.obj &
        $(OBJS)\corelib_statline.obj &
        $(OBJS)\corelib_stattext.obj &
        $(OBJS)\corelib_statusbr.obj &

+       $(OBJS)\corelib_textctrl.obj &

        $(OBJS)\corelib_theme.obj &
        $(OBJS)\corelib_toolbar.obj &
        $(OBJS)\corelib_topluniv.obj &
        $(OBJS)\corelib_theme.obj &
        $(OBJS)\corelib_toolbar.obj &
        $(OBJS)\corelib_topluniv.obj &


@@ -1551,7 +1551,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_utilsgui.obj &
        $(OBJS)\monodll_uxtheme.obj &
        $(OBJS)\monodll_window.obj &
        $(OBJS)\monodll_utilsgui.obj &
        $(OBJS)\monodll_uxtheme.obj &
        $(OBJS)\monodll_window.obj &

-       $(OBJS)\monodll_textctrl.obj &

        $(OBJS)\monodll_accel.obj &
        $(OBJS)\monodll_colrdlgg.obj &
        $(OBJS)\monodll_dirdlgg.obj &
        $(OBJS)\monodll_accel.obj &
        $(OBJS)\monodll_colrdlgg.obj &
        $(OBJS)\monodll_dirdlgg.obj &


@@ -1593,6 +1592,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_statline.obj &
        $(OBJS)\monodll_stattext.obj &
        $(OBJS)\monodll_statusbr.obj &
        $(OBJS)\monodll_statline.obj &
        $(OBJS)\monodll_stattext.obj &
        $(OBJS)\monodll_statusbr.obj &

+       $(OBJS)\monodll_textctrl.obj &

        $(OBJS)\monodll_theme.obj &
        $(OBJS)\monodll_toolbar.obj &
        $(OBJS)\monodll_topluniv.obj &
        $(OBJS)\monodll_theme.obj &
        $(OBJS)\monodll_toolbar.obj &
        $(OBJS)\monodll_topluniv.obj &


@@ -2316,6 +2316,13 @@ HTMLLIB_OBJECTS =  &
        $(OBJS)\htmllib_htmllbox.obj
 LIBDIRNAME = &
        ..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
        $(OBJS)\htmllib_htmllbox.obj
 LIBDIRNAME = &
        ..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

+MAKEARGS = CPPFLAGS=$(CPPFLAGS) OFFICIAL_BUILD=$(OFFICIAL_BUILD) &
+       WXUNIV=$(WXUNIV) DEBUG_FLAG=$(DEBUG_FLAG) CFLAGS=$(CFLAGS) &
+       RUNTIME_LIBS=$(RUNTIME_LIBS) CXX=$(CXX) CFG=$(CFG) USE_GUI=$(USE_GUI) &
+       MONOLITHIC=$(MONOLITHIC) CXXFLAGS=$(CXXFLAGS) CC=$(CC) USE_HTML=$(USE_HTML) &
+       BUILD=$(BUILD) LDFLAGS=$(LDFLAGS) DEBUG_INFO=$(DEBUG_INFO) SHARED=$(SHARED) &
+       VENDOR=$(VENDOR) USE_OPENGL=$(USE_OPENGL) USE_ODBC=$(USE_ODBC) &
+       UNICODE=$(UNICODE)

 MONODLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
 MONODLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &


@@ -2533,14 +2540,13 @@ NETLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &

-       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET &
-       $(CFLAGS)
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 $(CFLAGS)

 NETLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
 NETLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &

-       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET &
-       $(CXXFLAGS) /fh=$(OBJS)\wxprec_netlib.pch
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 $(CXXFLAGS) &
+       /fh=$(OBJS)\wxprec_netlib.pch

 NETLIB_OBJECTS =  &
        $(OBJS)\netlib_dummy.obj &
        $(OBJS)\netlib_fs_inet.obj &
 NETLIB_OBJECTS =  &
        $(OBJS)\netlib_dummy.obj &
        $(OBJS)\netlib_fs_inet.obj &


@@ -9691,6 +9697,11 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib :  $(ODBCLIB_OBJEC
 !endif
 !endif
 
 !endif
 !endif
 

+samples : .SYMBOLIC 
+       cd ..\..\samples
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+

 $(LIBDIRNAME)\wx\setup.h :  
        if not exist $(LIBDIRNAME)\wx\setup.h copy ..\..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h
 
 $(LIBDIRNAME)\wx\setup.h :  
        if not exist $(LIBDIRNAME)\wx\setup.h copy ..\..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h