Compile fixes

[wxWidgets.git] / utils / ogl / samples / ogledit / makefile.b32

diff --git a/utils/ogl/samples/ogledit/makefile.b32 b/utils/ogl/samples/ogledit/makefile.b32
index ffe204cf4604be0de5f044ff80717dcccdd4855a..7ee48625c22d585a47c9b4b5a8c77ed5d6411b83 100644 (file)
--- a/utils/ogl/samples/ogledit/makefile.b32
+++ b/utils/ogl/samples/ogledit/makefile.b32
@@ -1,88 +1,18 @@
 #
-# File:                makefile.bcc
+# File:                makefile.b32
 # Author:      Julian Smart
-# Created:     1996
+# Created:     1999
 # Updated:     
-# Copyright:   (c) 1996
+# Copyright:
 #
-# "%W% %G%"
-#
-# Makefile : Builds OGL example for BC++, 32-bit.
-
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
-
-!if "$(WXWIN)" == ""
-!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
-!endif
-
-!ifndef FINAL
-FINAL=0
-!endif
+# Makefile : Builds sample for 32-bit BC++
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-THISDIR = $(WXDIR)\utils\ogl\samples\ogledit
-
-OGLDIR = ..\.. # $(WXDIR)\utils\ogl # Command line too long!
-OGLINC = $(OGLDIR)\src
-OGLLIB = $(WXDIR)\lib\ogl.lib
-
-WXLIB = $(WXDIR)\lib\wx32.lib
-LIBS=$(WXLIB) $(OGLLIB) cw32 import32
-INC=/I$(OGLINC)
-CFG=$(WXDIR)\src\wxwin32.cfg
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v -DDEBUG=$(DEBUG)
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -O2
-DEBUG_FLAGS = -DDEBUG=$(DEBUG)
-!endif
-
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = ogledit.obj doc.obj view.obj palette.obj
-
-all:    ogl ogledit.exe
-
-ogl:
-    cd $(OGLDIR)\src
-    make -f makefile.b32
-    cd $(THISDIR)
-
-ogledit.exe:      $(WXLIB) $(OBJECTS) ogledit.def ogledit.res
-        tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-ogledit
-nul
-$(LIBS)
-ogledit.def
-!
-        brc32 -K ogledit.res
-
-.$(SRCSUFF).obj:
-       bcc32 $(CPPFLAGS) $(INC) -c {$< }
-
-ogledit.obj:      ogledit.$(SRCSUFF)
-
-doc.obj:      doc.$(SRCSUFF)
-
-view.obj:      view.$(SRCSUFF)
 
-palette.obj:      palette.$(SRCSUFF)
+TARGET=ogledit
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
+EXTRACPPFLAGS=-I$(WXDIR)\utils\ogl\src
+OBJECTS = $(TARGET).obj doc.obj view.obj palette.obj
 
-ogledit.res :      ogledit.rc $(WXDIR)\include\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa ogledit
+!include $(WXDIR)\src\makeprog.b32
 
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws