Applied patch [ 795491 ] Multimon sample compatibility with various conditions

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

diff --git a/contrib/build/ogl/makefile.gcc b/contrib/build/ogl/makefile.gcc
index 8ab3ed3c6c10b8daf8bfcd2d6660e57828c0fe09..5efca746287e1f14ce768adce25d7db1c9fc5a54 100644 (file)
--- a/contrib/build/ogl/makefile.gcc
+++ b/contrib/build/ogl/makefile.gcc
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

-include ../../../build/config.gcc
+include ../../../build/msw/config.gcc

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


@@ -12,15 +12,58 @@ include ../../../build/config.gcc
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-OGLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I..\..\src\ogl\..\..\..\lib\gcc_$(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) 
-OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I..\..\src\ogl\..\..\..\lib\gcc_$(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)
+OBJS = \
+       gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+OGLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) \
+       -I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL $(CXXFLAGS)
+OGLDLL_OBJECTS =  \
+       $(OBJS)\ogldll_dummy.o \
+       $(OBJS)\ogldll_basic2.o \
+       $(OBJS)\ogldll_canvas.o \
+       $(OBJS)\ogldll_divided.o \
+       $(OBJS)\ogldll_mfutils.o \
+       $(OBJS)\ogldll_oglmisc.o \
+       $(OBJS)\ogldll_basic.o \
+       $(OBJS)\ogldll_composit.o \
+       $(OBJS)\ogldll_drawn.o \
+       $(OBJS)\ogldll_bmpshape.o \
+       $(OBJS)\ogldll_constrnt.o \
+       $(OBJS)\ogldll_lines.o \
+       $(OBJS)\ogldll_ogldiag.o
+OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) \
+       -I..\..\src\ogl\..\..\include $(CXXFLAGS)
+OGLLIB_OBJECTS =  \
+       $(OBJS)\ogllib_dummy.o \
+       $(OBJS)\ogllib_basic2.o \
+       $(OBJS)\ogllib_canvas.o \
+       $(OBJS)\ogllib_divided.o \
+       $(OBJS)\ogllib_mfutils.o \
+       $(OBJS)\ogllib_oglmisc.o \
+       $(OBJS)\ogllib_basic.o \
+       $(OBJS)\ogllib_composit.o \
+       $(OBJS)\ogllib_drawn.o \
+       $(OBJS)\ogllib_bmpshape.o \
+       $(OBJS)\ogllib_constrnt.o \
+       $(OBJS)\ogllib_lines.o \
+       $(OBJS)\ogllib_ogldiag.o
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

 
 ### Conditionally set variables: ###
 
 ifeq ($(GCC_VERSION),2.95)
 GCCFLAGS = -fvtable-thunks
 endif
 
 ### Conditionally set variables: ###
 
 ifeq ($(GCC_VERSION),2.95)
 GCCFLAGS = -fvtable-thunks
 endif

+ifeq ($(SHARED),0)
+LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\gcc_lib$(CFG)
+endif
+ifeq ($(SHARED),1)
+LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\gcc_dll$(CFG)
+endif

 ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif
 ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif


@@ -34,6 +77,11 @@ ifeq ($(OFFICIAL_BUILD),1)
 VENDORTAG = 
 endif
 ifeq ($(BUILD),debug)
 VENDORTAG = 
 endif
 ifeq ($(BUILD),debug)

+ifeq ($(DEBUG_FLAG),default)
+WXDEBUGFLAG = d
+endif
+endif
+ifeq ($(DEBUG_FLAG),1)

 WXDEBUGFLAG = d
 endif
 ifeq ($(SHARED),1)
 WXDEBUGFLAG = d
 endif
 ifeq ($(SHARED),1)


@@ -46,14 +94,38 @@ ifeq ($(WXUNIV),1)
 WXUNIVNAME = univ
 endif
 ifeq ($(BUILD),debug)
 WXUNIVNAME = univ
 endif
 ifeq ($(BUILD),debug)

-__DEBUGFLAG = -g
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif

 endif
 ifeq ($(BUILD),release)
 endif
 ifeq ($(BUILD),release)

-__DEBUGFLAG = 
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g

 endif
 ifeq ($(BUILD),debug)
 endif
 ifeq ($(BUILD),debug)

+ifeq ($(DEBUG_FLAG),default)

 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif

+endif
+ifeq ($(DEBUG_FLAG),1)
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif

 ifeq ($(BUILD),debug)
 __OPTIMIZEFLAG = -O0
 endif
 ifeq ($(BUILD),debug)
 __OPTIMIZEFLAG = -O0
 endif


@@ -63,23 +135,30 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)

-__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core

 endif
 ifeq ($(MONOLITHIC),1)
 endif
 ifeq ($(MONOLITHIC),1)

-__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)

 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
 ifeq ($(SHARED),1)
 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
 ifeq ($(SHARED),1)

-__ogldll___depname = ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll
+__ogldll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll

 endif
 ifeq ($(SHARED),0)
 endif
 ifeq ($(SHARED),0)

-__ogllib___depname = ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a
+__ogllib___depname = \
+       $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a

 endif
 
 
 endif
 
 


@@ -91,99 +170,99 @@ $(OBJS):
 
 all: $(__ogldll___depname) $(__ogllib___depname)
 
 
 all: $(__ogldll___depname) $(__ogllib___depname)
 

-$(OBJS)\ogldll_basic.o: ../../src/ogl\basic.cpp
+$(OBJS)\ogldll_basic.o: ../../src/ogl/basic.cpp

        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 

-$(OBJS)\ogldll_basic2.o: ../../src/ogl\basic2.cpp
+$(OBJS)\ogldll_basic2.o: ../../src/ogl/basic2.cpp

        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 

-$(OBJS)\ogldll_bmpshape.o: ../../src/ogl\bmpshape.cpp
+$(OBJS)\ogldll_bmpshape.o: ../../src/ogl/bmpshape.cpp

        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 

-$(OBJS)\ogldll_canvas.o: ../../src/ogl\canvas.cpp
+$(OBJS)\ogldll_canvas.o: ../../src/ogl/canvas.cpp

        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 

-$(OBJS)\ogldll_composit.o: ../../src/ogl\composit.cpp
+$(OBJS)\ogldll_composit.o: ../../src/ogl/composit.cpp

        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 

-$(OBJS)\ogldll_constrnt.o: ../../src/ogl\constrnt.cpp
+$(OBJS)\ogldll_constrnt.o: ../../src/ogl/constrnt.cpp

        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 

-$(OBJS)\ogldll_divided.o: ../../src/ogl\divided.cpp
+$(OBJS)\ogldll_divided.o: ../../src/ogl/divided.cpp

        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 

-$(OBJS)\ogldll_drawn.o: ../../src/ogl\drawn.cpp
+$(OBJS)\ogldll_drawn.o: ../../src/ogl/drawn.cpp

        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 

-$(OBJS)\ogldll_dummy.o: ../../src/ogl\..\..\..\src\msw\dummy.cpp
+$(OBJS)\ogldll_dummy.o: ../../src/ogl/../../../src/msw/dummy.cpp

        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 

-$(OBJS)\ogldll_lines.o: ../../src/ogl\lines.cpp
+$(OBJS)\ogldll_lines.o: ../../src/ogl/lines.cpp

        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 

-$(OBJS)\ogldll_mfutils.o: ../../src/ogl\mfutils.cpp
+$(OBJS)\ogldll_mfutils.o: ../../src/ogl/mfutils.cpp

        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 

-$(OBJS)\ogldll_ogldiag.o: ../../src/ogl\ogldiag.cpp
+$(OBJS)\ogldll_ogldiag.o: ../../src/ogl/ogldiag.cpp

        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 

-$(OBJS)\ogldll_oglmisc.o: ../../src/ogl\oglmisc.cpp
+$(OBJS)\ogldll_oglmisc.o: ../../src/ogl/oglmisc.cpp

        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 

-$(OBJS)\ogllib_basic.o: ../../src/ogl\basic.cpp
+$(OBJS)\ogllib_basic.o: ../../src/ogl/basic.cpp

        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 

-$(OBJS)\ogllib_basic2.o: ../../src/ogl\basic2.cpp
+$(OBJS)\ogllib_basic2.o: ../../src/ogl/basic2.cpp

        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 

-$(OBJS)\ogllib_bmpshape.o: ../../src/ogl\bmpshape.cpp
+$(OBJS)\ogllib_bmpshape.o: ../../src/ogl/bmpshape.cpp

        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 

-$(OBJS)\ogllib_canvas.o: ../../src/ogl\canvas.cpp
+$(OBJS)\ogllib_canvas.o: ../../src/ogl/canvas.cpp

        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 

-$(OBJS)\ogllib_composit.o: ../../src/ogl\composit.cpp
+$(OBJS)\ogllib_composit.o: ../../src/ogl/composit.cpp

        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 

-$(OBJS)\ogllib_constrnt.o: ../../src/ogl\constrnt.cpp
+$(OBJS)\ogllib_constrnt.o: ../../src/ogl/constrnt.cpp

        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 

-$(OBJS)\ogllib_divided.o: ../../src/ogl\divided.cpp
+$(OBJS)\ogllib_divided.o: ../../src/ogl/divided.cpp

        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 

-$(OBJS)\ogllib_drawn.o: ../../src/ogl\drawn.cpp
+$(OBJS)\ogllib_drawn.o: ../../src/ogl/drawn.cpp

        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 

-$(OBJS)\ogllib_dummy.o: ../../src/ogl\..\..\..\src\msw\dummy.cpp
+$(OBJS)\ogllib_dummy.o: ../../src/ogl/../../../src/msw/dummy.cpp

        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 

-$(OBJS)\ogllib_lines.o: ../../src/ogl\lines.cpp
+$(OBJS)\ogllib_lines.o: ../../src/ogl/lines.cpp

        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 

-$(OBJS)\ogllib_mfutils.o: ../../src/ogl\mfutils.cpp
+$(OBJS)\ogllib_mfutils.o: ../../src/ogl/mfutils.cpp

        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 

-$(OBJS)\ogllib_ogldiag.o: ../../src/ogl\ogldiag.cpp
+$(OBJS)\ogllib_ogldiag.o: ../../src/ogl/ogldiag.cpp

        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 

-$(OBJS)\ogllib_oglmisc.o: ../../src/ogl\oglmisc.cpp
+$(OBJS)\ogllib_oglmisc.o: ../../src/ogl/oglmisc.cpp

        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o

-       -if exist ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll del ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll
-       -if exist ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a del ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a
-       -if exist ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a del ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a
+       -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a

 
 ifeq ($(SHARED),1)
 
 ifeq ($(SHARED),1)

-..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.o $(OBJS)\ogldll_basic2.o $(OBJS)\ogldll_canvas.o $(OBJS)\ogldll_divided.o $(OBJS)\ogldll_mfutils.o $(OBJS)\ogldll_oglmisc.o $(OBJS)\ogldll_basic.o $(OBJS)\ogldll_composit.o $(OBJS)\ogldll_drawn.o $(OBJS)\ogldll_bmpshape.o $(OBJS)\ogldll_constrnt.o $(OBJS)\ogldll_lines.o $(OBJS)\ogldll_ogldiag.o
-       $(CXX) -shared -o $@  $(OBJS)\ogldll_dummy.o $(OBJS)\ogldll_basic2.o $(OBJS)\ogldll_canvas.o $(OBJS)\ogldll_divided.o $(OBJS)\ogldll_mfutils.o $(OBJS)\ogldll_oglmisc.o $(OBJS)\ogldll_basic.o $(OBJS)\ogldll_composit.o $(OBJS)\ogldll_drawn.o $(OBJS)\ogldll_bmpshape.o $(OBJS)\ogldll_constrnt.o $(OBJS)\ogldll_lines.o $(OBJS)\ogldll_ogldiag.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a  $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll: $(OGLDLL_OBJECTS)
+       $(CXX) -shared -o $@ $(OGLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)

 endif
 
 ifeq ($(SHARED),0)
 endif
 
 ifeq ($(SHARED),0)

-..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a: $(OBJS)\ogllib_dummy.o $(OBJS)\ogllib_basic2.o $(OBJS)\ogllib_canvas.o $(OBJS)\ogllib_divided.o $(OBJS)\ogllib_mfutils.o $(OBJS)\ogllib_oglmisc.o $(OBJS)\ogllib_basic.o $(OBJS)\ogllib_composit.o $(OBJS)\ogllib_drawn.o $(OBJS)\ogllib_bmpshape.o $(OBJS)\ogllib_constrnt.o $(OBJS)\ogllib_lines.o $(OBJS)\ogllib_ogldiag.o
+$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a: $(OGLLIB_OBJECTS)

        if exist $@ del $@
        if exist $@ del $@

-       ar rcu $@  $(OBJS)\ogllib_dummy.o $(OBJS)\ogllib_basic2.o $(OBJS)\ogllib_canvas.o $(OBJS)\ogllib_divided.o $(OBJS)\ogllib_mfutils.o $(OBJS)\ogllib_oglmisc.o $(OBJS)\ogllib_basic.o $(OBJS)\ogllib_composit.o $(OBJS)\ogllib_drawn.o $(OBJS)\ogllib_bmpshape.o $(OBJS)\ogllib_constrnt.o $(OBJS)\ogllib_lines.o $(OBJS)\ogllib_ogldiag.o
+       ar rcu $@ $(OGLLIB_OBJECTS)

        ranlib $@
 endif
 
        ranlib $@
 endif