offset version by 1 to avoid having compatibility_version of 0.0.0 under Darwin:...

[wxWidgets.git] / contrib / build / ogl / makefile.wat

diff --git a/contrib/build/ogl/makefile.wat b/contrib/build/ogl/makefile.wat
index 650daa7e0195a07cb55ab7da0b0ce2fa4ada670b..1ee826baf011d3d0ab22ef3077a8b46e61e7440f 100644 (file)
--- a/contrib/build/ogl/makefile.wat
+++ b/contrib/build/ogl/makefile.wat
@@ -1,10 +1,10 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

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

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

-!include ../../../build/config.wat
+!include ../../../build/msw/config.wat

 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!


@@ -43,11 +43,12 @@ VENDORTAG =
 !endif
 WXDEBUGFLAG =
 !ifeq BUILD debug
 !endif
 WXDEBUGFLAG =
 !ifeq BUILD debug

+!ifeq DEBUG_FLAG default

 WXDEBUGFLAG = d
 !endif
 WXDEBUGFLAG = d
 !endif

-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
+!endif
+!ifeq DEBUG_FLAG 1
+WXDEBUGFLAG = d

 !endif
 WXUNICODEFLAG =
 !ifeq UNICODE 1
 !endif
 WXUNICODEFLAG =
 !ifeq UNICODE 1


@@ -57,23 +58,94 @@ WXUNIVNAME =
 !ifeq WXUNIV 1
 WXUNIVNAME = univ
 !endif
 !ifeq WXUNIV 1
 WXUNIVNAME = univ
 !endif

-__DEBUGFLAG =
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__ogldll___depname =
+!ifeq SHARED 1
+__ogldll___depname = &
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll
+!endif
+__DEBUGINFO_2 =

 !ifeq BUILD debug
 !ifeq BUILD debug

-__DEBUGFLAG = -d2
+!ifeq DEBUG_INFO default
+__DEBUGINFO_2 = debug all
+!endif

 !endif
 !ifeq BUILD release
 !endif
 !ifeq BUILD release

-__DEBUGFLAG = -d0
+!ifeq DEBUG_INFO default
+__DEBUGINFO_2 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_2 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_2 = debug all
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).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
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib

 !endif
 !endif

-__DEBUGFLAG_1 =
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__ogllib___depname =
+!ifeq SHARED 0
+__ogllib___depname = &
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
+!endif
+__DEBUGINFO_1 =

 !ifeq BUILD debug
 !ifeq BUILD debug

-__DEBUGFLAG_1 = debug all
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = -d2
+!endif

 !endif
 !ifeq BUILD release
 !endif
 !ifeq BUILD release

-__DEBUGFLAG_1 = 
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = -d0

 !endif
 !endif

-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-__DEBUG_DEFINE_p = -d__WXDEBUG__
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = -d2

 !endif
 __OPTIMIZEFLAG =
 !ifeq BUILD debug
 !endif
 __OPTIMIZEFLAG =
 !ifeq BUILD debug


@@ -82,6 +154,13 @@ __OPTIMIZEFLAG = -od
 !ifeq BUILD release
 __OPTIMIZEFLAG = -ot -ox
 !endif
 !ifeq BUILD release
 __OPTIMIZEFLAG = -ot -ox
 !endif

+__THREADSFLAG =
+!ifeq USE_THREADS 0
+__THREADSFLAG = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG = -bm
+!endif

 __RUNTIME_LIBS =
 !ifeq RUNTIME_LIBS dynamic
 __RUNTIME_LIBS = -br
 __RUNTIME_LIBS =
 !ifeq RUNTIME_LIBS dynamic
 __RUNTIME_LIBS = -br


@@ -89,41 +168,100 @@ __RUNTIME_LIBS = -br
 !ifeq RUNTIME_LIBS static
 __RUNTIME_LIBS = 
 !endif
 !ifeq RUNTIME_LIBS static
 __RUNTIME_LIBS = 
 !endif

-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1
+__RTTIFLAG =
+!ifeq USE_RTTI 0
+__RTTIFLAG = 

 !endif
 !endif

-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!ifeq USE_RTTI 1
+__RTTIFLAG = -xr

 !endif
 !endif

-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+__EXCEPTIONSFLAG =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG = 

 !endif
 !endif

-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG = -xs

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

-__ogldll___depname =
-!ifeq SHARED 1
-__ogldll___depname = ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wat$(VENDORTAG).dll
+__DEBUG_DEFINE_p =
+!ifeq BUILD debug
+!ifeq DEBUG_FLAG default
+__DEBUG_DEFINE_p = -d__WXDEBUG__

 !endif
 !endif

-__ogllib___depname =
-!ifeq SHARED 0
-__ogllib___depname = ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib
+!endif
+!ifeq DEBUG_FLAG 1
+__DEBUG_DEFINE_p = -d__WXDEBUG__
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE

 !endif
 
 ### Variables: ###
 
 !endif
 
 ### Variables: ###
 

-OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-OGLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\ogl\..\..\..\include -i=..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\ogl\..\..\..\src\tiff -i=..\..\src\ogl\..\..\..\src\jpeg -i=..\..\src\ogl\..\..\..\src\png -i=..\..\src\ogl\..\..\..\src\zlib  -i=..\..\src\ogl\..\..\..\src\regex -i=..\..\src\ogl\..\..\..\src\expat\lib -i=..\..\src\ogl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_OGL -dwxUSE_DEPRECATED=0 $(CXXFLAGS) /fh=$(OBJS)\wxprec_ogldll.pch 
-OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\ogl\..\..\..\include -i=..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\ogl\..\..\..\src\tiff -i=..\..\src\ogl\..\..\..\src\jpeg -i=..\..\src\ogl\..\..\..\src\png -i=..\..\src\ogl\..\..\..\src\zlib  -i=..\..\src\ogl\..\..\..\src\regex -i=..\..\src\ogl\..\..\..\src\expat\lib -i=..\..\src\ogl\..\..\include $(CXXFLAGS) /fh=$(OBJS)\wxprec_ogllib.pch
-
+WX_RELEASE_NODOT = 26
+OBJS = &
+       wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+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) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) -i=..\..\src\ogl\..\..\..\include -i=$(SETUPHDIR) -wx &
+       -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\ogl\..\..\include &
+       -dWXUSINGDLL -dWXMAKINGDLL_OGL /fh=$(OBJS)\wxprec_ogldll.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+OGLDLL_OBJECTS =  &
+       $(OBJS)\ogldll_dummy.obj &
+       $(OBJS)\ogldll_basic2.obj &
+       $(OBJS)\ogldll_canvas.obj &
+       $(OBJS)\ogldll_divided.obj &
+       $(OBJS)\ogldll_mfutils.obj &
+       $(OBJS)\ogldll_oglmisc.obj &
+       $(OBJS)\ogldll_basic.obj &
+       $(OBJS)\ogldll_composit.obj &
+       $(OBJS)\ogldll_drawn.obj &
+       $(OBJS)\ogldll_bmpshape.obj &
+       $(OBJS)\ogldll_constrnt.obj &
+       $(OBJS)\ogldll_lines.obj &
+       $(OBJS)\ogldll_ogldiag.obj
+OGLLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
+       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) -i=..\..\src\ogl\..\..\..\include -i=$(SETUPHDIR) -wx &
+       -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\ogl\..\..\include &
+       /fh=$(OBJS)\wxprec_ogllib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)
+OGLLIB_OBJECTS =  &
+       $(OBJS)\ogllib_dummy.obj &
+       $(OBJS)\ogllib_basic2.obj &
+       $(OBJS)\ogllib_canvas.obj &
+       $(OBJS)\ogllib_divided.obj &
+       $(OBJS)\ogllib_mfutils.obj &
+       $(OBJS)\ogllib_oglmisc.obj &
+       $(OBJS)\ogllib_basic.obj &
+       $(OBJS)\ogllib_composit.obj &
+       $(OBJS)\ogllib_drawn.obj &
+       $(OBJS)\ogllib_bmpshape.obj &
+       $(OBJS)\ogllib_constrnt.obj &
+       $(OBJS)\ogllib_lines.obj &
+       $(OBJS)\ogllib_ogldiag.obj

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


@@ -134,111 +272,116 @@ $(OBJS) :
 
 all : .SYMBOLIC $(__ogldll___depname) $(__ogllib___depname)
 
 
 all : .SYMBOLIC $(__ogldll___depname) $(__ogllib___depname)
 

-$(OBJS)\ogldll_basic.obj :  .AUTODEPEND ../../src/ogl\basic.cpp
+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)\*.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
+
+!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
+       @%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 $(LDFLAGS) $(__DEBUGINFO_2)  libpath $(LIBDIRNAME)
+       @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)  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
+       wlink @$(OBJS)\ogldll.lbc
+       wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib +$^@
+!endif
+
+!ifeq SHARED 0
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib :  $(OGLLIB_OBJECTS)
+       @%create $(OBJS)\ogllib.lbc
+       @for %i in ($(OGLLIB_OBJECTS)) do @%append $(OBJS)\ogllib.lbc +%i
+       wlib -q -p4096 -n -b $^@ @$(OBJS)\ogllib.lbc
+!endif
+
+$(OBJS)\ogldll_dummy.obj :  .AUTODEPEND ../../src/ogl\..\..\..\src\msw\dummy.cpp

        $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
        $(CXX) -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) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=..\..\src\ogl\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG) $<
+

 $(OBJS)\ogldll_basic2.obj :  .AUTODEPEND ../../src/ogl\basic2.cpp
        $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_basic2.obj :  .AUTODEPEND ../../src/ogl\basic2.cpp
        $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 

-$(OBJS)\ogldll_bmpshape.obj :  .AUTODEPEND ../../src/ogl\bmpshape.cpp
+$(OBJS)\ogldll_canvas.obj :  .AUTODEPEND ../../src/ogl\canvas.cpp

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

-$(OBJS)\ogldll_canvas.obj :  .AUTODEPEND ../../src/ogl\canvas.cpp
+$(OBJS)\ogldll_divided.obj :  .AUTODEPEND ../../src/ogl\divided.cpp

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

-$(OBJS)\ogldll_composit.obj :  .AUTODEPEND ../../src/ogl\composit.cpp
+$(OBJS)\ogldll_mfutils.obj :  .AUTODEPEND ../../src/ogl\mfutils.cpp

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

-$(OBJS)\ogldll_constrnt.obj :  .AUTODEPEND ../../src/ogl\constrnt.cpp
+$(OBJS)\ogldll_oglmisc.obj :  .AUTODEPEND ../../src/ogl\oglmisc.cpp

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

-$(OBJS)\ogldll_divided.obj :  .AUTODEPEND ../../src/ogl\divided.cpp
+$(OBJS)\ogldll_basic.obj :  .AUTODEPEND ../../src/ogl\basic.cpp

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

-$(OBJS)\ogldll_drawn.obj :  .AUTODEPEND ../../src/ogl\drawn.cpp
+$(OBJS)\ogldll_composit.obj :  .AUTODEPEND ../../src/ogl\composit.cpp

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

-$(OBJS)\ogldll_dummy.obj :  .AUTODEPEND ../../src/ogl\..\..\..\src\msw\dummy.cpp
+$(OBJS)\ogldll_drawn.obj :  .AUTODEPEND ../../src/ogl\drawn.cpp

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

-$(OBJS)\ogldll_lines.obj :  .AUTODEPEND ../../src/ogl\lines.cpp
+$(OBJS)\ogldll_bmpshape.obj :  .AUTODEPEND ../../src/ogl\bmpshape.cpp

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

-$(OBJS)\ogldll_mfutils.obj :  .AUTODEPEND ../../src/ogl\mfutils.cpp
+$(OBJS)\ogldll_constrnt.obj :  .AUTODEPEND ../../src/ogl\constrnt.cpp

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

-$(OBJS)\ogldll_ogldiag.obj :  .AUTODEPEND ../../src/ogl\ogldiag.cpp
+$(OBJS)\ogldll_lines.obj :  .AUTODEPEND ../../src/ogl\lines.cpp

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

-$(OBJS)\ogldll_oglmisc.obj :  .AUTODEPEND ../../src/ogl\oglmisc.cpp
+$(OBJS)\ogldll_ogldiag.obj :  .AUTODEPEND ../../src/ogl\ogldiag.cpp

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

-$(OBJS)\ogllib_basic.obj :  .AUTODEPEND ../../src/ogl\basic.cpp
+$(OBJS)\ogllib_dummy.obj :  .AUTODEPEND ../../src/ogl\..\..\..\src\msw\dummy.cpp

        $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_basic2.obj :  .AUTODEPEND ../../src/ogl\basic2.cpp
        $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
        $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_basic2.obj :  .AUTODEPEND ../../src/ogl\basic2.cpp
        $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 

-$(OBJS)\ogllib_bmpshape.obj :  .AUTODEPEND ../../src/ogl\bmpshape.cpp
-       $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
-

 $(OBJS)\ogllib_canvas.obj :  .AUTODEPEND ../../src/ogl\canvas.cpp
        $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_canvas.obj :  .AUTODEPEND ../../src/ogl\canvas.cpp
        $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 

-$(OBJS)\ogllib_composit.obj :  .AUTODEPEND ../../src/ogl\composit.cpp
+$(OBJS)\ogllib_divided.obj :  .AUTODEPEND ../../src/ogl\divided.cpp

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

-$(OBJS)\ogllib_constrnt.obj :  .AUTODEPEND ../../src/ogl\constrnt.cpp
+$(OBJS)\ogllib_mfutils.obj :  .AUTODEPEND ../../src/ogl\mfutils.cpp

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

-$(OBJS)\ogllib_divided.obj :  .AUTODEPEND ../../src/ogl\divided.cpp
+$(OBJS)\ogllib_oglmisc.obj :  .AUTODEPEND ../../src/ogl\oglmisc.cpp

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

-$(OBJS)\ogllib_drawn.obj :  .AUTODEPEND ../../src/ogl\drawn.cpp
+$(OBJS)\ogllib_basic.obj :  .AUTODEPEND ../../src/ogl\basic.cpp

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

-$(OBJS)\ogllib_dummy.obj :  .AUTODEPEND ../../src/ogl\..\..\..\src\msw\dummy.cpp
+$(OBJS)\ogllib_composit.obj :  .AUTODEPEND ../../src/ogl\composit.cpp

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

-$(OBJS)\ogllib_lines.obj :  .AUTODEPEND ../../src/ogl\lines.cpp
+$(OBJS)\ogllib_drawn.obj :  .AUTODEPEND ../../src/ogl\drawn.cpp

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

-$(OBJS)\ogllib_mfutils.obj :  .AUTODEPEND ../../src/ogl\mfutils.cpp
+$(OBJS)\ogllib_bmpshape.obj :  .AUTODEPEND ../../src/ogl\bmpshape.cpp

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

-$(OBJS)\ogllib_ogldiag.obj :  .AUTODEPEND ../../src/ogl\ogldiag.cpp
+$(OBJS)\ogllib_constrnt.obj :  .AUTODEPEND ../../src/ogl\constrnt.cpp

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

-$(OBJS)\ogllib_oglmisc.obj :  .AUTODEPEND ../../src/ogl\oglmisc.cpp
+$(OBJS)\ogllib_lines.obj :  .AUTODEPEND ../../src/ogl\lines.cpp

        $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
        $(CXX) -zq -fo=$^@ $(OGLLIB_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 ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wat$(VENDORTAG).dll del ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wat$(VENDORTAG).dll
-       -if exist ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib
-       -if exist ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib
-
-!ifeq SHARED 1
-..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wat$(VENDORTAG).dll :  $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_basic2.obj $(OBJS)\ogldll_canvas.obj $(OBJS)\ogldll_divided.obj $(OBJS)\ogldll_mfutils.obj $(OBJS)\ogldll_oglmisc.obj $(OBJS)\ogldll_basic.obj $(OBJS)\ogldll_composit.obj $(OBJS)\ogldll_drawn.obj $(OBJS)\ogldll_bmpshape.obj $(OBJS)\ogldll_constrnt.obj $(OBJS)\ogldll_lines.obj $(OBJS)\ogldll_ogldiag.obj
-       @%create $(OBJS)\ogldll.lbc
-       @%append $(OBJS)\ogldll.lbc option quiet
-       @%append $(OBJS)\ogldll.lbc name $^@
-       @%append $(OBJS)\ogldll.lbc option incremental
-       @%append $(OBJS)\ogldll.lbc $(LDFLAGS) $(__DEBUGFLAG_1)  libpath ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-       @for %i in ( $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_basic2.obj $(OBJS)\ogldll_canvas.obj $(OBJS)\ogldll_divided.obj $(OBJS)\ogldll_mfutils.obj $(OBJS)\ogldll_oglmisc.obj $(OBJS)\ogldll_basic.obj $(OBJS)\ogldll_composit.obj $(OBJS)\ogldll_drawn.obj $(OBJS)\ogldll_bmpshape.obj $(OBJS)\ogldll_constrnt.obj $(OBJS)\ogldll_lines.obj $(OBJS)\ogldll_ogldiag.obj) do @%append $(OBJS)\ogldll.lbc file %i
-       @for %i in ( $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib 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  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\ogldll.lbc library %i
-       @%append $(OBJS)\ogldll.lbc
-       @%append $(OBJS)\ogldll.lbc system nt_dll
-       wlink @$(OBJS)\ogldll.lbc
-       wlib -q -n -b ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib +$^@
-!endif
+$(OBJS)\ogllib_ogldiag.obj :  .AUTODEPEND ../../src/ogl\ogldiag.cpp
+       $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<

 
 

-!ifeq SHARED 0
-..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib :  $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_basic2.obj $(OBJS)\ogllib_canvas.obj $(OBJS)\ogllib_divided.obj $(OBJS)\ogllib_mfutils.obj $(OBJS)\ogllib_oglmisc.obj $(OBJS)\ogllib_basic.obj $(OBJS)\ogllib_composit.obj $(OBJS)\ogllib_drawn.obj $(OBJS)\ogllib_bmpshape.obj $(OBJS)\ogllib_constrnt.obj $(OBJS)\ogllib_lines.obj $(OBJS)\ogllib_ogldiag.obj
-       @%create $(OBJS)\ogllib.lbc
-       @for %i in ( $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_basic2.obj $(OBJS)\ogllib_canvas.obj $(OBJS)\ogllib_divided.obj $(OBJS)\ogllib_mfutils.obj $(OBJS)\ogllib_oglmisc.obj $(OBJS)\ogllib_basic.obj $(OBJS)\ogllib_composit.obj $(OBJS)\ogllib_drawn.obj $(OBJS)\ogllib_bmpshape.obj $(OBJS)\ogllib_constrnt.obj $(OBJS)\ogllib_lines.obj $(OBJS)\ogllib_ogldiag.obj) do @%append $(OBJS)\ogllib.lbc +%i
-       wlib -q -p2048 -n -b $^@ @$(OBJS)\ogllib.lbc
-!endif