fix for dmc compilation of projects with more than one obj

[wxWidgets.git] / samples / grid / makefile.b32

diff --git a/samples/grid/makefile.b32 b/samples/grid/makefile.b32
index 56b22620bbff01c177a29f7e6603565ccc7a92ea..b606a6649aa275fbd84e49d980520806b4215d1d 100644 (file)
--- a/samples/grid/makefile.b32
+++ b/samples/grid/makefile.b32
@@ -1,63 +1,17 @@
 #
 #

-# File:                makefile.bcc
-# Author:      Julian Smart
-# Created:     1993
+# File:                makefile.b32
+# Author:      Michael Bedward
+# Created:     1999

 # Updated:     
 # Updated:     

-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:

 #
 #

-# "%W% %G%"
-#
-# Makefile : Builds grid test example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++

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

-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
-
-TARGET=test
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = test.obj
-
-$(TARGET).exe: $(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-       bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-       bcc32 $(CPPFLAGS) -P- -c {$< }

 
 

-test.obj:      test.$(SRCSUFF)
+TARGET=griddemo

 
 

-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
+OBJECTS = griddemo.obj

 
 

-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
+!include $(WXDIR)\src\makeprog.b32