Modified makefile.unx to include bitmaps dir. Added missing folder.xpm

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

diff --git a/utils/ogl/samples/ogledit/makefile.bcc b/utils/ogl/samples/ogledit/makefile.bcc
index 0b94f0ab2465f8f32d3d22b5119b4ec80bb971af..171d966ebd99836aa60794d431287fb080a998ec 100644 (file)
--- a/utils/ogl/samples/ogledit/makefile.bcc
+++ b/utils/ogl/samples/ogledit/makefile.bcc
@@ -1,87 +1,21 @@
 #
 # File:                makefile.bcc
 # Author:      Julian Smart
 #
 # File:                makefile.bcc
 # Author:      Julian Smart

-# Created:     1996
+# Created:     1998

 # Updated:     
 # Updated:     

-# Copyright:   (c) 1996

 #
 #

-# "%W% %G%"
-#
-# Makefile : Builds OGL example for BC++, 16-bit.
-
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
+# Builds a BC++ 16-bit sample

 
 !if "$(WXWIN)" == ""
 !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
 !endif
 
 
 !if "$(WXWIN)" == ""
 !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
 !endif
 

-!ifndef FINAL
-FINAL=0
-!endif
-

 WXDIR = $(WXWIN)
 WXDIR = $(WXWIN)

-!include $(WXDIR)\src\makebcc.env
-
-THISDIR = $(WXDIR)\utils\ogl\samples\ogledit
-
-OGLDIR = $(WXDIR)\utils\ogl
-OGLINC = $(OGLDIR)\src
-OGLLIB = $(OGLDIR)\lib\ogl.lib
-
-WXLIB = $(WXDIR)\lib\wx.lib
-LIBS=$(WXLIB) $(OGLLIB) mathwl cwl import
-INC=/I$(OGLINC)
-CFG=$(WXDIR)\src\wxwin.cfg
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -O2
-DEBUG_FLAGS =
-!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.bcc
-    cd $(THISDIR)
-
-ogledit.exe:      $(WXLIB) $(OBJECTS) ogledit.def ogledit.res
-        tlink $(LINKFLAGS) @&&!
-c0wl.obj $(OBJECTS)
-ogledit
-nul
-$(LIBS)
-ogledit.def
-!
-        rc -30 -K ogledit.res
-
-.$(SRCSUFF).obj:
-       bcc $(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\wx\msw\wx.rc
-    rc -r /i$(BCCDIR)\include /i$(WXDIR)\include ogledit
+!include $(WXDIR)\src\makeprog.b32

 
 

-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws