define _HPUX_SOURCE under HP-UX, otherwise many things are not defined in standard...

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

diff --git a/contrib/build/ogl/makefile.vc b/contrib/build/ogl/makefile.vc
index 37f7cc403a309e2b0160fc3422a939c9c4545d0d..0bebbd0635ae8a911366dc0e199ef88ee32dd828 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.4 (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!
 # =========================================================================
 


@@ -12,23 +12,26 @@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-WX_RELEASE_NODOT = 25
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
+WX_RELEASE_NODOT = 27
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0

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

+LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\vc_$(LIBTYPE_SUFFIX)$(CFG)

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

-OGLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_4) /DWIN32 \
+OGLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_9)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO_1) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).pdb \
        $(__DEBUGINFO_1) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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) $(__UNICODE_DEFINE_p) \
-       /I..\..\src\ogl\..\..\..\include /I$(SETUPHDIR) /W4 \
-       /I..\..\src\ogl\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_OGL \
-       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_ogldll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(____DEBUGRUNTIME) $(__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) \
+       $(__MSLU_DEFINE_p) /I..\..\src\ogl\..\..\..\include /I$(SETUPHDIR) /W4 \
+       /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 \


@@ -41,13 +44,14 @@ 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 = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_16) /DWIN32 \
+OGLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME) /DWIN32 \

        $(__DEBUGINFO_1) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.pdb \
        $(__DEBUGINFO_1) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.pdb \

-       $(____DEBUGRUNTIME_15_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\src\ogl\..\..\..\include /I$(SETUPHDIR) /W4 \
-       /I..\..\src\ogl\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \
+       $(____DEBUGRUNTIME) $(__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) \
+       $(__MSLU_DEFINE_p) /I..\..\src\ogl\..\..\..\include /I$(SETUPHDIR) /W4 \
+       /I..\..\src\ogl\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \

        /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ogllib.pch" $(CPPFLAGS) $(CXXFLAGS)
 OGLLIB_OBJECTS =  \
        $(OBJS)\ogllib_dummy.obj \
        /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ogllib.pch" $(CPPFLAGS) $(CXXFLAGS)
 OGLLIB_OBJECTS =  \
        $(OBJS)\ogllib_dummy.obj \


@@ -93,6 +97,12 @@ WXUNIVNAME = univ
 !if "$(SHARED)" == "1"
 WXDLLFLAG = dll
 !endif
 !if "$(SHARED)" == "1"
 WXDLLFLAG = dll
 !endif

+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif

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


@@ -115,23 +125,53 @@ __DEBUGINFO_2 =
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_2 = /DEBUG
 !endif
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_2 = /DEBUG
 !endif

+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif

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

-____DEBUGRUNTIME_3_p = 
+____DEBUGRUNTIME_3_p_1 = 

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

-____DEBUGRUNTIME_3_p = /D_DEBUG
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG

 !endif
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p = $(____DEBUGINFO)
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_9 = D

 !endif
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_4 = 
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_9 = $(__THREADSFLAG)

 !endif
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_4 = d
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
+!endif
+!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"
+__UNICODE_DEFINE_p_1 = /d _UNICODE

 !endif
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 = $(__DEBUGINFO)
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1

 !endif
 !if "$(MONOLITHIC)" == "1"
 __WXLIB_MONO_p = \
 !endif
 !if "$(MONOLITHIC)" == "1"
 __WXLIB_MONO_p = \


@@ -161,23 +201,11 @@ __WXLIB_BASE_p = \
 __ogllib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
 !endif
 __ogllib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_15_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_15_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_15_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_16 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_16 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_22 = D

 !endif
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_16 = $(__DEBUGINFO)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_22 = $(__THREADSFLAG)

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


@@ -191,29 +219,29 @@ __DEBUGINFO_1 =
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_1 = /Zi
 !endif
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_1 = /Zi
 !endif

-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO = /D_DEBUG
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME = /D_DEBUG

 !endif
 !endif

-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO = 
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME = 

 !endif
 !endif

-!if "$(DEBUG_INFO)" == "0"
-____DEBUGINFO = 
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME = 

 !endif
 !endif

-!if "$(DEBUG_INFO)" == "1"
-____DEBUGINFO = /D_DEBUG
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME = /D_DEBUG

 !endif
 !endif

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

 !endif
 !endif

-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = 
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME = 

 !endif
 !endif

-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = 
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME = 

 !endif
 !endif

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

 !endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG = /Od
 !endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG = /Od


@@ -221,23 +249,23 @@ __OPTIMIZEFLAG = /Od
 !if "$(BUILD)" == "release"
 __OPTIMIZEFLAG = /O2
 !endif
 !if "$(BUILD)" == "release"
 __OPTIMIZEFLAG = /O2
 !endif

-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS = D
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG = L

 !endif
 !endif

-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS = T
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG = T

 !endif
 !endif

-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG = 
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG = 

 !endif
 !endif

-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG = /GR
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG = /GR

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

-__EXCEPTIONSFLAG_0 = 
+__EXCEPTIONSFLAG = 

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

-__EXCEPTIONSFLAG_0 = /GX
+__EXCEPTIONSFLAG = /EHsc

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


@@ -254,14 +282,20 @@ __DEBUG_DEFINE_p = /D__WXDEBUG__
 !if "$(DEBUG_FLAG)" == "1"
 __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
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /D_UNICODE
 !endif

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

 !endif
 
 
 !endif
 
 


@@ -276,6 +310,7 @@ all: $(__ogldll___depname) $(__ogllib___depname)
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
 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_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).dll
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).ilk
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).dll
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).ilk
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).pdb


@@ -283,7 +318,7 @@ clean:
        -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"
        -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_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.obj  $(OGLDLL_OBJECTS)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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
 <<
        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
 <<


@@ -292,7 +327,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
 !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 $@
 !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:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<

        $(OGLLIB_OBJECTS)
 <<
 !endif
        $(OGLLIB_OBJECTS)
 <<
 !endif


@@ -300,6 +335,9 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\ogldll_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
 $(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) $(__MSLU_DEFINE_p_1) /i ..\..\src\ogl\..\..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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) $**
 


@@ -374,3 +412,4 @@ $(OBJS)\ogllib_lines.obj: ../../src/ogl\lines.cpp
 
 $(OBJS)\ogllib_ogldiag.obj: ../../src/ogl\ogldiag.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
 
 $(OBJS)\ogllib_ogldiag.obj: ../../src/ogl\ogldiag.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**

+