Fix for MGL link error

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

diff --git a/contrib/build/ogl/makefile.vc b/contrib/build/ogl/makefile.vc
index ac7cfbf30e93911fd866e9998f1f50f64cdab56f..1f3d6ae1f26df3c314d4151307851654af57e7fa 100644 (file)
--- a/contrib/build/ogl/makefile.vc
+++ b/contrib/build/ogl/makefile.vc
@@ -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.8 (http://bakefile.sourceforge.net)

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


@@ -12,18 +12,25 @@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

+WX_RELEASE_NODOT = 26

 OBJS = \
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

-OGLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\vc_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+OGLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_9)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_1) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /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) /W4 \
        /I..\..\src\ogl\..\..\..\include /I$(SETUPHDIR) /W4 \

-       /I..\..\src\ogl\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_OGL $(CXXFLAGS) /GR \
-       /GX /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ogldll.pch"
+       /I..\..\src\ogl\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_OGL $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ogldll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)

 OGLDLL_OBJECTS =  \
        $(OBJS)\ogldll_dummy.obj \
 OGLDLL_OBJECTS =  \
        $(OBJS)\ogldll_dummy.obj \

+       $(OBJS)\ogldll_version.res \

        $(OBJS)\ogldll_basic2.obj \
        $(OBJS)\ogldll_canvas.obj \
        $(OBJS)\ogldll_divided.obj \
        $(OBJS)\ogldll_basic2.obj \
        $(OBJS)\ogldll_canvas.obj \
        $(OBJS)\ogldll_divided.obj \


@@ -36,14 +43,15 @@ OGLDLL_OBJECTS =  \
        $(OBJS)\ogldll_constrnt.obj \
        $(OBJS)\ogldll_lines.obj \
        $(OBJS)\ogldll_ogldiag.obj
        $(OBJS)\ogldll_constrnt.obj \
        $(OBJS)\ogldll_lines.obj \
        $(OBJS)\ogldll_ogldiag.obj

-OGLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_13) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.pdb \
-       $(____DEBUGRUNTIME_12_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+OGLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME_17) /DWIN32 \
+       $(__DEBUGINFO_1) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.pdb \
+       $(____DEBUGRUNTIME_16_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /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) /W4 \
        /I..\..\src\ogl\..\..\..\include /I$(SETUPHDIR) /W4 \

-       /I..\..\src\ogl\..\..\include $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_ogllib.pch"
+       /I..\..\src\ogl\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ogllib.pch" $(CPPFLAGS) $(CXXFLAGS)

 OGLLIB_OBJECTS =  \
        $(OBJS)\ogllib_dummy.obj \
        $(OBJS)\ogllib_basic2.obj \
 OGLLIB_OBJECTS =  \
        $(OBJS)\ogllib_dummy.obj \
        $(OBJS)\ogllib_basic2.obj \


@@ -58,17 +66,9 @@ OGLLIB_OBJECTS =  \
        $(OBJS)\ogllib_constrnt.obj \
        $(OBJS)\ogllib_lines.obj \
        $(OBJS)\ogllib_ogldiag.obj
        $(OBJS)\ogllib_constrnt.obj \
        $(OBJS)\ogllib_lines.obj \
        $(OBJS)\ogllib_ogldiag.obj

-SETUPHDIR = \
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 

-!if "$(SHARED)" == "0"
-LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\vc_lib$(CFG)
-!endif
-!if "$(SHARED)" == "1"
-LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\vc_dll$(CFG)
-!endif

 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif
 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif


@@ -87,41 +87,33 @@ WXDEBUGFLAG = d
 !if "$(DEBUG_FLAG)" == "1"
 WXDEBUGFLAG = d
 !endif
 !if "$(DEBUG_FLAG)" == "1"
 WXDEBUGFLAG = d
 !endif

-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif

 !if "$(UNICODE)" == "1"
 WXUNICODEFLAG = u
 !endif
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
 !if "$(UNICODE)" == "1"
 WXUNICODEFLAG = u
 !endif
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif

-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = 
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll

 !endif
 !endif

-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = /Zi
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib

 !endif
 !endif

-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll

 !endif
 !endif

-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = 
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 

 !endif
 !endif

-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 = 
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  

 !endif
 !endif

-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
+!if "$(SHARED)" == "1"
+__ogldll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).dll

 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"

-__DEBUGINFO_2 = d
+__DEBUGINFO_2 = /DEBUG

 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_2 = 
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_2 = 


@@ -130,78 +122,143 @@ __DEBUGINFO_2 =
 __DEBUGINFO_2 = 
 !endif
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_2 = 
 !endif
 !if "$(DEBUG_INFO)" == "1"

-__DEBUGINFO_2 = d
+__DEBUGINFO_2 = /DEBUG

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"

-__DEBUGRUNTIME_13 = 
+____DEBUGRUNTIME_3_p = 

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"

-__DEBUGRUNTIME_13 = d
+____DEBUGRUNTIME_3_p = /D_DEBUG

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"

-__DEBUGRUNTIME_13 = $(__DEBUGINFO_2)
+____DEBUGRUNTIME_3_p = $(____DEBUGINFO)

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"

-__DEBUGRUNTIME_3 = 
+____DEBUGRUNTIME_3_p_1 = 

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"

-__DEBUGRUNTIME_3 = d
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"

-__DEBUGRUNTIME_3 = $(__DEBUGINFO_2)
+____DEBUGRUNTIME_3_p_1 = $(____DEBUGINFO_3_p_1)

 !endif
 !endif

-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+____DEBUGINFO_3_p_1 = /d _DEBUG

 !endif
 !endif

-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+____DEBUGINFO_3_p_1 = 

 !endif
 !endif

-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!if "$(DEBUG_INFO)" == "0"
+____DEBUGINFO_3_p_1 = 

 !endif
 !endif

-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!if "$(DEBUG_INFO)" == "1"
+____DEBUGINFO_3_p_1 = /d _DEBUG

 !endif
 !endif

-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = $(__DEBUGINFO)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_9 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_9 = $(__THREADSFLAG)

 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"

-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__

 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"

-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__

 !endif
 !endif

-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = /Od
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__

 !endif
 !endif

-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = /O2
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p_1 = /d __WXDEBUG__

 !endif
 !endif

-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS = D
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p_1 = /d __WXDEBUG__

 !endif
 !endif

-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS = T
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS

 !endif
 !if "$(UNICODE)" == "1"
 !endif
 !if "$(UNICODE)" == "1"

-__UNICODE_DEFINE_p = /D_UNICODE
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib

 !endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 !endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
 !endif
 !if "$(MONOLITHIC)" == "0"

-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib

 !endif
 !if "$(MONOLITHIC)" == "0"
 !endif
 !if "$(MONOLITHIC)" == "0"

-__WXLIB_CORE_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 !endif
 !endif

-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!if "$(SHARED)" == "0"
+__ogllib___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib

 !endif
 !endif

-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_16_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_16_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_16_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_17 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_17 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_17 = $(__DEBUGINFO)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_22 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_22 = $(__THREADSFLAG)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /Zi

 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 ____DEBUGINFO = /D_DEBUG
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 ____DEBUGINFO = /D_DEBUG


@@ -215,31 +272,68 @@ ____DEBUGINFO =
 !if "$(DEBUG_INFO)" == "1"
 ____DEBUGINFO = /D_DEBUG
 !endif
 !if "$(DEBUG_INFO)" == "1"
 ____DEBUGINFO = /D_DEBUG
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_12_p = 
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = d

 !endif
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_12_p = /D_DEBUG
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = 

 !endif
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_12_p = $(____DEBUGINFO)
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = 

 !endif
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p = 
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = d

 !endif
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG = /Od

 !endif
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = $(____DEBUGINFO)
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG = /O2

 !endif
 !endif

-!if "$(SHARED)" == "1"
-__ogldll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).dll
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG = L

 !endif
 !endif

-!if "$(SHARED)" == "0"
-__ogllib___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG = T
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p = /D__WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p = /D__WXDEBUG__
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE

 !endif
 
 
 !endif
 
 


@@ -251,104 +345,109 @@ $(OBJS):
 
 all: $(__ogldll___depname) $(__ogllib___depname)
 
 
 all: $(__ogldll___depname) $(__ogllib___depname)
 

-$(OBJS)\ogldll_basic.obj: ../../src/ogl\basic.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).pdb
+       -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
+
+!if "$(SHARED)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.obj  $(OGLDLL_OBJECTS) $(OBJS)\ogldll_version.res
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2)  /LIBPATH:$(LIBDIRNAME) @<<
+       $(OGLDLL_OBJECTS)  $(__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) $(__UNICOWS_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 oleacc.lib odbc32.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
+<<
+!endif
+
+!if "$(SHARED)" == "0"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib: $(OBJS)\ogllib_dummy.obj  $(OGLLIB_OBJECTS)
+       if exist $@ del $@
+       lib /NOLOGO /OUT:$@ @<<
+       $(OGLLIB_OBJECTS)
+<<
+!endif
+
+$(OBJS)\ogldll_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
+
+$(OBJS)\ogldll_version.res: ../../src/ogl\..\..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i ..\..\src\ogl\..\..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG) $**

 
 $(OBJS)\ogldll_basic2.obj: ../../src/ogl\basic2.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 
 
 $(OBJS)\ogldll_basic2.obj: ../../src/ogl\basic2.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 

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

        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 
        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 

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

        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 
        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 

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

        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 
        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 

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

        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 
        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 

-$(OBJS)\ogldll_divided.obj: ../../src/ogl\divided.cpp
+$(OBJS)\ogldll_basic.obj: ../../src/ogl\basic.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
+
+$(OBJS)\ogldll_composit.obj: ../../src/ogl\composit.cpp

        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 
 $(OBJS)\ogldll_drawn.obj: ../../src/ogl\drawn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 
        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 
 $(OBJS)\ogldll_drawn.obj: ../../src/ogl\drawn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 

-$(OBJS)\ogldll_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
+$(OBJS)\ogldll_bmpshape.obj: ../../src/ogl\bmpshape.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**

 
 

-$(OBJS)\ogldll_lines.obj: ../../src/ogl\lines.cpp
+$(OBJS)\ogldll_constrnt.obj: ../../src/ogl\constrnt.cpp

        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 
        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 

-$(OBJS)\ogldll_mfutils.obj: ../../src/ogl\mfutils.cpp
+$(OBJS)\ogldll_lines.obj: ../../src/ogl\lines.cpp

        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 
 $(OBJS)\ogldll_ogldiag.obj: ../../src/ogl\ogldiag.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 
        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 
 $(OBJS)\ogldll_ogldiag.obj: ../../src/ogl\ogldiag.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
 

-$(OBJS)\ogldll_oglmisc.obj: ../../src/ogl\oglmisc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
+$(OBJS)\ogllib_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) /Ycwx/wxprec.h $**

 
 

-$(OBJS)\ogllib_basic.obj: ../../src/ogl\basic.cpp
+$(OBJS)\ogllib_basic2.obj: ../../src/ogl\basic2.cpp

        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 
        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 

-$(OBJS)\ogllib_basic2.obj: ../../src/ogl\basic2.cpp
+$(OBJS)\ogllib_canvas.obj: ../../src/ogl\canvas.cpp

        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 
        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 

-$(OBJS)\ogllib_bmpshape.obj: ../../src/ogl\bmpshape.cpp
+$(OBJS)\ogllib_divided.obj: ../../src/ogl\divided.cpp

        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 
        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 

-$(OBJS)\ogllib_canvas.obj: ../../src/ogl\canvas.cpp
+$(OBJS)\ogllib_mfutils.obj: ../../src/ogl\mfutils.cpp

        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 
        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 

-$(OBJS)\ogllib_composit.obj: ../../src/ogl\composit.cpp
+$(OBJS)\ogllib_oglmisc.obj: ../../src/ogl\oglmisc.cpp

        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 
        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 

-$(OBJS)\ogllib_constrnt.obj: ../../src/ogl\constrnt.cpp
+$(OBJS)\ogllib_basic.obj: ../../src/ogl\basic.cpp

        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 
        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 

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

        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 
 $(OBJS)\ogllib_drawn.obj: ../../src/ogl\drawn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 
        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 
 $(OBJS)\ogllib_drawn.obj: ../../src/ogl\drawn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 

-$(OBJS)\ogllib_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\ogllib_lines.obj: ../../src/ogl\lines.cpp
+$(OBJS)\ogllib_bmpshape.obj: ../../src/ogl\bmpshape.cpp

        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 
        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 

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

        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 
        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 

-$(OBJS)\ogllib_ogldiag.obj: ../../src/ogl\ogldiag.cpp
+$(OBJS)\ogllib_lines.obj: ../../src/ogl\lines.cpp

        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 
        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 

-$(OBJS)\ogllib_oglmisc.obj: ../../src/ogl\oglmisc.cpp
+$(OBJS)\ogllib_ogldiag.obj: ../../src/ogl\ogldiag.cpp

        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 
        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 

-clean: 
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).pdb
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib
-
-!if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.obj  $(OGLDLL_OBJECTS)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(OGLDLL_OBJECTS)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) 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 oleacc.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib
-<<
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib: $(OBJS)\ogllib_dummy.obj  $(OGLLIB_OBJECTS)
-       if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
-       $(OGLLIB_OBJECTS)
-<<
-!endif