Compilation fix

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

diff --git a/samples/grid/makefile.g95 b/samples/grid/makefile.g95
index 32f8af5e2f83066f256827e97a6d49035accc40d..b81d8cc55ca3cbdd29247c66c6c19b84899352ad 100644 (file)
--- a/samples/grid/makefile.g95
+++ b/samples/grid/makefile.g95
@@ -1,37 +1,15 @@
 #
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1993
-# Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# File:         makefile.g95
+# Author:       Michael Bedward
+# Created:      1999
+# Updated:
 #
-# "%W% %G%"
-#
-# Makefile for grid example (UNIX).
+# Makefile for wxWindows sample (Cygwin/Mingw32).
 
 WXDIR = ../..
 
-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/makeg95.env
-
-OBJECTS = $(OBJDIR)/test.$(OBJSUFF) $(OBJDIR)/test_resources.$(OBJSUFF)
-
-all:    $(OBJDIR) test$(GUISUFFIX)$(EXESUFF)
-
-wx:
-
-$(OBJDIR):
-       mkdir $(OBJDIR)
-
-test$(GUISUFFIX)$(EXESUFF):    $(OBJECTS) $(WXLIB)
-       $(CC) $(LDFLAGS) -o test$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
-
-$(OBJDIR)/test.$(OBJSUFF):     test.$(SRCSUFF)
-       $(CC) -c $(CPPFLAGS) -o $@ test.$(SRCSUFF)
+TARGET=griddemo
+OBJECTS = $(TARGET).o
 
-$(OBJDIR)/test_resources.o:  test.rc
-       $(RESCOMP) -i test.rc -o $(OBJDIR)/test_resources.o $(RESFLAGS)
+include $(WXDIR)/src/makeprog.g95
 
-clean:
-       rm -f $(OBJECTS) test$(GUISUFFIX).exe core *.rsc *.res