added bookctrl.h and listbook.h; moved bookctrl.cpp to the correct place

[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 a73e9731f700a7861772a85798ba1a78bfe1cfcf..1009b80bf54617c3708806675d11dbb555b604b3 100644 (file)
--- a/contrib/samples/ogl/studio/makefile.wat
+++ b/contrib/samples/ogl/studio/makefile.wat
@@ -27,6 +27,13 @@ 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


@@ -132,6 +139,11 @@ __UNICODE_DEFINE_p =
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -dwxUSE_UNICODE=1
 !endif
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -dwxUSE_UNICODE=1
 !endif

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

 __WXLIB_BASE_p =
 !ifeq MONOLITHIC 0
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 __WXLIB_BASE_p =
 !ifeq MONOLITHIC 0
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib


@@ -153,30 +165,25 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-LIBDIRNAME = &
-       .\..\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

-OGLEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
+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) &
        $(__RUNTIME_LIBS_5) -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 -i=. &
-       $(__DLLFLAG_p) -i=.\..\..\..\include $(CXXFLAGS)
-OGLEDIT_OBJECTS =  &
-       $(OBJS)\ogledit_studio.obj &
-       $(OBJS)\ogledit_doc.obj &
-       $(OBJS)\ogledit_shapes.obj &
-       $(OBJS)\ogledit_symbols.obj &
-       $(OBJS)\ogledit_view.obj &
-       $(OBJS)\ogledit_cspalette.obj &
-       $(OBJS)\ogledit_mainfrm.obj &
-       $(OBJS)\ogledit_project.obj &
-       $(OBJS)\ogledit_dialogs.obj &
-       $(OBJS)\ogledit_csprint.obj
-
-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
+       $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. &
+       $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS)
+STUDIO_OBJECTS =  &
+       $(OBJS)\studio_studio.obj &
+       $(OBJS)\studio_doc.obj &
+       $(OBJS)\studio_shapes.obj &
+       $(OBJS)\studio_symbols.obj &
+       $(OBJS)\studio_view.obj &
+       $(OBJS)\studio_cspalette.obj &
+       $(OBJS)\studio_mainfrm.obj &
+       $(OBJS)\studio_project.obj &
+       $(OBJS)\studio_dialogs.obj &
+       $(OBJS)\studio_csprint.obj

 
 
 all : $(OBJS)
 
 
 all : $(OBJS)


@@ -185,59 +192,59 @@ $(OBJS) :
 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all : .SYMBOLIC $(OBJS)\ogledit.exe data
+all : .SYMBOLIC $(OBJS)\studio.exe data

 
 

-$(OBJS)\ogledit_cspalette.obj :  .AUTODEPEND .\cspalette.cpp
-       $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
+$(OBJS)\studio_cspalette.obj :  .AUTODEPEND .\cspalette.cpp
+       $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<

 
 

-$(OBJS)\ogledit_csprint.obj :  .AUTODEPEND .\csprint.cpp
-       $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
+$(OBJS)\studio_csprint.obj :  .AUTODEPEND .\csprint.cpp
+       $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<

 
 

-$(OBJS)\ogledit_dialogs.obj :  .AUTODEPEND .\dialogs.cpp
-       $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
+$(OBJS)\studio_dialogs.obj :  .AUTODEPEND .\dialogs.cpp
+       $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<

 
 

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

 
 

-$(OBJS)\ogledit_mainfrm.obj :  .AUTODEPEND .\mainfrm.cpp
-       $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
+$(OBJS)\studio_mainfrm.obj :  .AUTODEPEND .\mainfrm.cpp
+       $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<

 
 

-$(OBJS)\ogledit_project.obj :  .AUTODEPEND .\project.cpp
-       $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
+$(OBJS)\studio_project.obj :  .AUTODEPEND .\project.cpp
+       $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<

 
 

-$(OBJS)\ogledit_shapes.obj :  .AUTODEPEND .\shapes.cpp
-       $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
+$(OBJS)\studio_shapes.obj :  .AUTODEPEND .\shapes.cpp
+       $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<

 
 

-$(OBJS)\ogledit_studio.obj :  .AUTODEPEND .\studio.cpp
-       $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
+$(OBJS)\studio_studio.obj :  .AUTODEPEND .\studio.cpp
+       $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<

 
 

-$(OBJS)\ogledit_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=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\..\include $<
+$(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)\ogledit_symbols.obj :  .AUTODEPEND .\symbols.cpp
-       $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
+$(OBJS)\studio_symbols.obj :  .AUTODEPEND .\symbols.cpp
+       $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<

 
 

-$(OBJS)\ogledit_view.obj :  .AUTODEPEND .\view.cpp
-       $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
+$(OBJS)\studio_view.obj :  .AUTODEPEND .\view.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
 
 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)\ogledit.exe del $(OBJS)\ogledit.exe
+       -if exist $(OBJS)\studio.exe del $(OBJS)\studio.exe

 
 data : .SYMBOLIC 
        if not exist $(OBJS) mkdir $(OBJS)
        for %f in (studio_resources.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 
 data : .SYMBOLIC 
        if not exist $(OBJS) mkdir $(OBJS)
        for %f in (studio_resources.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 

-$(OBJS)\ogledit.exe :  $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_studio.res
-       @%create $(OBJS)\ogledit.lbc
-       @%append $(OBJS)\ogledit.lbc option quiet
-       @%append $(OBJS)\ogledit.lbc name $^@
-       @%append $(OBJS)\ogledit.lbc option incremental
-       @%append $(OBJS)\ogledit.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-       @for %i in ($(OGLEDIT_OBJECTS)) do @%append $(OBJS)\ogledit.lbc file %i
-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib $(__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)\ogledit.lbc library %i
-       @%append $(OBJS)\ogledit.lbc option resource=$(OBJS)\ogledit_studio.res
-       wlink @$(OBJS)\ogledit.lbc
+$(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 incremental
+       @%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_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