X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd9f42b6a94f9d68c66cf363093442b12cd4e953..a0086878b09ea394de9f5746a5e8f066a3d12dec:/contrib/build/ogl/makefile.bcc

diff --git a/contrib/build/ogl/makefile.bcc b/contrib/build/ogl/makefile.bcc
index 5f566f5f0c..9e9ddecc1e 100644
--- a/contrib/build/ogl/makefile.bcc
+++ b/contrib/build/ogl/makefile.bcc
@@ -1,10 +1,15 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
+.autodepend
+
 !ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
 BCCDIR = $(MAKEDIR)\..
 !endif
 
@@ -14,24 +19,17 @@ BCCDIR = $(MAKEDIR)\..
 # Do not modify the rest of this file!
 # -------------------------------------------------------------------------
 
-!if "$(BCCDIR)" == "\.."
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-
 ### Variables: ###
 
-LIBDIRNAME = \
-	..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
 	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-OGLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+OGLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(LIBDIRNAME) \
-	-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 $(CXXFLAGS) -Hu \
-	-H=$(OBJS)\wxprec_ogldll.csm
+	$(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) \
+	-I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL -Hu \
+	-H=$(OBJS)\wxprec_ogldll.csm $(CPPFLAGS) $(CXXFLAGS)
 OGLDLL_OBJECTS =  \
 	$(OBJS)\ogldll_dummy.obj \
 	$(OBJS)\ogldll_basic2.obj \
@@ -46,13 +44,11 @@ OGLDLL_OBJECTS =  \
 	$(OBJS)\ogldll_constrnt.obj \
 	$(OBJS)\ogldll_lines.obj \
 	$(OBJS)\ogldll_ogldiag.obj
-OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
+OGLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(LIBDIRNAME) \
-	-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) -Hu -H=$(OBJS)\wxprec_ogllib.csm
+	$(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) \
+	-I..\..\src\ogl\..\..\include -Hu -H=$(OBJS)\wxprec_ogllib.csm $(CPPFLAGS) \
+	$(CXXFLAGS)
 OGLLIB_OBJECTS =  \
 	$(OBJS)\ogllib_dummy.obj \
 	$(OBJS)\ogllib_basic2.obj \
@@ -88,32 +84,31 @@ WXDEBUGFLAG = d
 !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 "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
 !endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
+!if "$(SHARED)" == "1"
+__ogldll___depname = \
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll
 !endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = i
 !endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
 !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
@@ -121,8 +116,31 @@ __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
 !if "$(USE_GUI)" == "1"
 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!endif
+!if "$(SHARED)" == "0"
+__ogllib___depname = \
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
 !endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG = -Od
@@ -136,40 +154,25 @@ __RUNTIME_LIBS = -tWR
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS = 
 !endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 = 
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 !endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p = -D__WXDEBUG__
 !endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p = -D__WXDEBUG__
 !endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
 !endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!if "$(SHARED)" == "0"
+LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\bcc_lib$(CFG)
 !endif
 !if "$(SHARED)" == "1"
-__ogldll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll
-!endif
-!if "$(SHARED)" == "0"
-__ogllib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib
+LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\bcc_dll$(CFG)
 !endif
 
-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DVENDOR=$(VENDOR) -DWXUNIV=$(WXUNIV)
-
 
 all: $(OBJS)
 $(OBJS):
@@ -179,103 +182,108 @@ $(OBJS):
 
 all: $(__ogldll___depname) $(__ogllib___depname)
 
-$(OBJS)\ogldll_basic.obj: ../../src/ogl\basic.cpp
-	$(CXX) -q -c -P -o$@ $(OGLDLL_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_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).tds
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).ilc
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).ild
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).ilf
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).ils
+	-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_bcc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.obj  $(OGLDLL_OBJECTS)
+	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
+	c0d32.obj $(OGLDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
+|
+	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl $@
+!endif
+
+!if "$(SHARED)" == "0"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib: $(OBJS)\ogllib_dummy.obj  $(OGLLIB_OBJECTS)
+	if exist $@ del $@
+	tlib /a /p4096 $@ @&&|
+	$(OGLLIB_OBJECTS)
+|
+!endif
+
+$(OBJS)\ogldll_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp
+	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) -H $**
 
 $(OBJS)\ogldll_basic2.obj: ../../src/ogl\basic2.cpp
 	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
 
-$(OBJS)\ogldll_bmpshape.obj: ../../src/ogl\bmpshape.cpp
+$(OBJS)\ogldll_canvas.obj: ../../src/ogl\canvas.cpp
 	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
 
-$(OBJS)\ogldll_canvas.obj: ../../src/ogl\canvas.cpp
+$(OBJS)\ogldll_divided.obj: ../../src/ogl\divided.cpp
 	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
 
-$(OBJS)\ogldll_composit.obj: ../../src/ogl\composit.cpp
+$(OBJS)\ogldll_mfutils.obj: ../../src/ogl\mfutils.cpp
 	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
 
-$(OBJS)\ogldll_constrnt.obj: ../../src/ogl\constrnt.cpp
+$(OBJS)\ogldll_oglmisc.obj: ../../src/ogl\oglmisc.cpp
 	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
 
-$(OBJS)\ogldll_divided.obj: ../../src/ogl\divided.cpp
+$(OBJS)\ogldll_basic.obj: ../../src/ogl\basic.cpp
+	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
+
+$(OBJS)\ogldll_composit.obj: ../../src/ogl\composit.cpp
 	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
 
 $(OBJS)\ogldll_drawn.obj: ../../src/ogl\drawn.cpp
 	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
 
-$(OBJS)\ogldll_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) -H $**
+$(OBJS)\ogldll_bmpshape.obj: ../../src/ogl\bmpshape.cpp
+	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
 
-$(OBJS)\ogldll_lines.obj: ../../src/ogl\lines.cpp
+$(OBJS)\ogldll_constrnt.obj: ../../src/ogl\constrnt.cpp
 	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
 
-$(OBJS)\ogldll_mfutils.obj: ../../src/ogl\mfutils.cpp
+$(OBJS)\ogldll_lines.obj: ../../src/ogl\lines.cpp
 	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
 
 $(OBJS)\ogldll_ogldiag.obj: ../../src/ogl\ogldiag.cpp
 	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
 
-$(OBJS)\ogldll_oglmisc.obj: ../../src/ogl\oglmisc.cpp
-	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
+$(OBJS)\ogllib_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp
+	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) -H $**
 
-$(OBJS)\ogllib_basic.obj: ../../src/ogl\basic.cpp
+$(OBJS)\ogllib_basic2.obj: ../../src/ogl\basic2.cpp
 	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
 
-$(OBJS)\ogllib_basic2.obj: ../../src/ogl\basic2.cpp
+$(OBJS)\ogllib_canvas.obj: ../../src/ogl\canvas.cpp
 	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
 
-$(OBJS)\ogllib_bmpshape.obj: ../../src/ogl\bmpshape.cpp
+$(OBJS)\ogllib_divided.obj: ../../src/ogl\divided.cpp
 	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
 
-$(OBJS)\ogllib_canvas.obj: ../../src/ogl\canvas.cpp
+$(OBJS)\ogllib_mfutils.obj: ../../src/ogl\mfutils.cpp
 	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
 
-$(OBJS)\ogllib_composit.obj: ../../src/ogl\composit.cpp
+$(OBJS)\ogllib_oglmisc.obj: ../../src/ogl\oglmisc.cpp
 	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
 
-$(OBJS)\ogllib_constrnt.obj: ../../src/ogl\constrnt.cpp
+$(OBJS)\ogllib_basic.obj: ../../src/ogl\basic.cpp
 	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
 
-$(OBJS)\ogllib_divided.obj: ../../src/ogl\divided.cpp
+$(OBJS)\ogllib_composit.obj: ../../src/ogl\composit.cpp
 	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
 
 $(OBJS)\ogllib_drawn.obj: ../../src/ogl\drawn.cpp
 	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
 
-$(OBJS)\ogllib_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) -H $**
-
-$(OBJS)\ogllib_lines.obj: ../../src/ogl\lines.cpp
+$(OBJS)\ogllib_bmpshape.obj: ../../src/ogl\bmpshape.cpp
 	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
 
-$(OBJS)\ogllib_mfutils.obj: ../../src/ogl\mfutils.cpp
+$(OBJS)\ogllib_constrnt.obj: ../../src/ogl\constrnt.cpp
 	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
 
-$(OBJS)\ogllib_ogldiag.obj: ../../src/ogl\ogldiag.cpp
+$(OBJS)\ogllib_lines.obj: ../../src/ogl\lines.cpp
 	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
 
-$(OBJS)\ogllib_oglmisc.obj: ../../src/ogl\oglmisc.cpp
+$(OBJS)\ogllib_ogldiag.obj: ../../src/ogl\ogldiag.cpp
 	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll
-	-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)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll: $(OGLDLL_OBJECTS) $(OBJS)\ogldll_dummy.obj
-	ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-	c0d32.obj $(OGLDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
-|
-	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl $@
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib: $(OGLLIB_OBJECTS) $(OBJS)\ogllib_dummy.obj
-	if exist $@ del $@
-	tlib /a /p2048 $@ @&&|
-	$(OGLLIB_OBJECTS)
-|
-!endif