wxUSE_STL fixes.

[wxWidgets.git] / contrib / samples / ogl / studio / makefile.wat

diff --git a/contrib/samples/ogl/studio/makefile.wat b/contrib/samples/ogl/studio/makefile.wat
index e9b0a57a9781f0a4bf1a82c487f24b7e0727b055..bada539a801a126f5d13539a1c2d3d3adf75ed0f 100644 (file)
--- a/contrib/samples/ogl/studio/makefile.wat
+++ b/contrib/samples/ogl/studio/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -27,13 +27,6 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 

-LIBDIRNAME =
-!ifeq SHARED 0
-LIBDIRNAME = .\..\..\..\..\lib\wat_lib$(CFG)
-!endif
-!ifeq SHARED 1
-LIBDIRNAME = .\..\..\..\..\lib\wat_dll$(CFG)
-!endif

 PORTNAME =
 !ifeq USE_GUI 0
 PORTNAME = base
 PORTNAME =
 !ifeq USE_GUI 0
 PORTNAME = base


@@ -50,10 +43,6 @@ WXDEBUGFLAG = d
 !ifeq DEBUG_FLAG 1
 WXDEBUGFLAG = d
 !endif
 !ifeq DEBUG_FLAG 1
 WXDEBUGFLAG = d
 !endif

-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif

 WXUNICODEFLAG =
 !ifeq UNICODE 1
 WXUNICODEFLAG = u
 WXUNICODEFLAG =
 !ifeq UNICODE 1
 WXUNICODEFLAG = u


@@ -62,6 +51,10 @@ WXUNIVNAME =
 !ifeq WXUNIV 1
 WXUNIVNAME = univ
 !endif
 !ifeq WXUNIV 1
 WXUNIVNAME = univ
 !endif

+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif

 __DEBUGINFO_0 =
 !ifeq BUILD debug
 !ifeq DEBUG_INFO default
 __DEBUGINFO_0 =
 !ifeq BUILD debug
 !ifeq DEBUG_INFO default


@@ -96,38 +89,6 @@ __DEBUGINFO_1 =
 !ifeq DEBUG_INFO 1
 __DEBUGINFO_1 = debug all
 !endif
 !ifeq DEBUG_INFO 1
 __DEBUGINFO_1 = debug all
 !endif

-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-__EXCEPTIONSFLAG_7 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_7 = 
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_7 = -xs
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif

 __OPTIMIZEFLAG_2 =
 !ifeq BUILD debug
 __OPTIMIZEFLAG_2 = -od
 __OPTIMIZEFLAG_2 =
 !ifeq BUILD debug
 __OPTIMIZEFLAG_2 = -od


@@ -142,38 +103,77 @@ __RUNTIME_LIBS_5 = -br
 !ifeq RUNTIME_LIBS static
 __RUNTIME_LIBS_5 = 
 !endif
 !ifeq RUNTIME_LIBS static
 __RUNTIME_LIBS_5 = 
 !endif

-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
+__EXCEPTIONSFLAG_7 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_7 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_7 = -xs

 !endif
 __WXLIB_ADV_p =
 !ifeq MONOLITHIC 0
 __WXLIB_ADV_p = &
        wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
 !endif
 !endif
 __WXLIB_ADV_p =
 !ifeq MONOLITHIC 0
 __WXLIB_ADV_p = &
        wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
 !endif

-__WXLIB_BASE_p =
+__WXLIB_HTML_p =

 !ifeq MONOLITHIC 0
 !ifeq MONOLITHIC 0

-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib

 !endif
 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0
 __WXLIB_CORE_p = &
        wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
 !endif
 !endif
 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0
 __WXLIB_CORE_p = &
        wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
 !endif

-__WXLIB_HTML_p =
+__WXLIB_BASE_p =

 !ifeq MONOLITHIC 0
 !ifeq MONOLITHIC 0

-__WXLIB_HTML_p = &
-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
+__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib

 !endif
 __WXLIB_MONO_p =
 !ifeq MONOLITHIC 1
 __WXLIB_MONO_p = &
        wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !endif
 __WXLIB_MONO_p =
 !ifeq MONOLITHIC 1
 __WXLIB_MONO_p = &
        wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif

+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+LIBDIRNAME =
+!ifeq SHARED 0
+LIBDIRNAME = .\..\..\..\..\lib\wat_lib$(CFG)
+!endif
+!ifeq SHARED 1
+LIBDIRNAME = .\..\..\..\..\lib\wat_dll$(CFG)
+!endif

 __WXUNIV_DEFINE_p =
 !ifeq WXUNIV 1
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 !endif
 __WXUNIV_DEFINE_p =
 !ifeq WXUNIV 1
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 !endif

+__DEBUG_DEFINE_p =
+!ifeq BUILD debug
+!ifeq DEBUG_FLAG default
+__DEBUG_DEFINE_p = -d__WXDEBUG__
+!endif
+!endif
+!ifeq DEBUG_FLAG 1
+__DEBUG_DEFINE_p = -d__WXDEBUG__
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif

 
 ### Variables: ###
 
 
 ### Variables: ###
 


@@ -181,11 +181,11 @@ OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

-STUDIO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
-       $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. &
-       $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS) &
-       $(__EXCEPTIONSFLAG_7)
+STUDIO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) &
+       -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
+       -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\..\..\samples -i=.\..\..\..\include $(__EXCEPTIONSFLAG_7) &
+       $(CPPFLAGS) $(CXXFLAGS)

 STUDIO_OBJECTS =  &
        $(OBJS)\studio_studio.obj &
        $(OBJS)\studio_doc.obj &
 STUDIO_OBJECTS =  &
        $(OBJS)\studio_studio.obj &
        $(OBJS)\studio_doc.obj &


@@ -207,57 +207,57 @@ $(OBJS) :
 
 all : .SYMBOLIC $(OBJS)\studio.exe data
 
 
 all : .SYMBOLIC $(OBJS)\studio.exe data
 

-$(OBJS)\studio_cspalette.obj :  .AUTODEPEND .\cspalette.cpp
-       $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\studio.exe del $(OBJS)\studio.exe

 
 

-$(OBJS)\studio_csprint.obj :  .AUTODEPEND .\csprint.cpp
-       $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
+$(OBJS)\studio.exe :  $(STUDIO_OBJECTS) $(OBJS)\studio_studio.res
+       @%create $(OBJS)\studio.lbc
+       @%append $(OBJS)\studio.lbc option quiet
+       @%append $(OBJS)\studio.lbc name $^@
+       @%append $(OBJS)\studio.lbc option caseexact
+       @%append $(OBJS)\studio.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+       @for %i in ($(STUDIO_OBJECTS)) do @%append $(OBJS)\studio.lbc file %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   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 ) do @%append $(OBJS)\studio.lbc library %i
+       @%append $(OBJS)\studio.lbc option resource=$(OBJS)\studio_studio.res
+       wlink @$(OBJS)\studio.lbc

 
 

-$(OBJS)\studio_dialogs.obj :  .AUTODEPEND .\dialogs.cpp
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (studio_resources.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\studio_studio.obj :  .AUTODEPEND .\studio.cpp

        $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
 
 $(OBJS)\studio_doc.obj :  .AUTODEPEND .\doc.cpp
        $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
 
        $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
 
 $(OBJS)\studio_doc.obj :  .AUTODEPEND .\doc.cpp
        $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
 

-$(OBJS)\studio_mainfrm.obj :  .AUTODEPEND .\mainfrm.cpp
+$(OBJS)\studio_shapes.obj :  .AUTODEPEND .\shapes.cpp

        $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
 
        $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
 

-$(OBJS)\studio_project.obj :  .AUTODEPEND .\project.cpp
+$(OBJS)\studio_symbols.obj :  .AUTODEPEND .\symbols.cpp

        $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
 
        $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
 

-$(OBJS)\studio_shapes.obj :  .AUTODEPEND .\shapes.cpp
+$(OBJS)\studio_view.obj :  .AUTODEPEND .\view.cpp

        $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
 
        $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
 

-$(OBJS)\studio_studio.obj :  .AUTODEPEND .\studio.cpp
+$(OBJS)\studio_cspalette.obj :  .AUTODEPEND .\cspalette.cpp

        $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
 
        $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
 

-$(OBJS)\studio_studio.res :  .AUTODEPEND .\studio.rc
-       wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $<
-
-$(OBJS)\studio_symbols.obj :  .AUTODEPEND .\symbols.cpp
+$(OBJS)\studio_mainfrm.obj :  .AUTODEPEND .\mainfrm.cpp

        $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
 
        $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
 

-$(OBJS)\studio_view.obj :  .AUTODEPEND .\view.cpp
+$(OBJS)\studio_project.obj :  .AUTODEPEND .\project.cpp

        $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
 
        $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
 

-clean : .SYMBOLIC 
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-       -if exist $(OBJS)\studio.exe del $(OBJS)\studio.exe
+$(OBJS)\studio_dialogs.obj :  .AUTODEPEND .\dialogs.cpp
+       $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<

 
 

-data : .SYMBOLIC 
-       if not exist $(OBJS) mkdir $(OBJS)
-       for %f in (studio_resources.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\studio_csprint.obj :  .AUTODEPEND .\csprint.cpp
+       $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<

 
 

-$(OBJS)\studio.exe :  $(STUDIO_OBJECTS) $(OBJS)\studio_studio.res
-       @%create $(OBJS)\studio.lbc
-       @%append $(OBJS)\studio.lbc option quiet
-       @%append $(OBJS)\studio.lbc name $^@
-       @%append $(OBJS)\studio.lbc option caseexact
-       @%append $(OBJS)\studio.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-       @for %i in ($(STUDIO_OBJECTS)) do @%append $(OBJS)\studio.lbc file %i
-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\studio.lbc library %i
-       @%append $(OBJS)\studio.lbc option resource=$(OBJS)\studio_studio.res
-       wlink @$(OBJS)\studio.lbc
+$(OBJS)\studio_studio.res :  .AUTODEPEND .\studio.rc
+       wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $<