Reverted wxFileSystem changes to image.cpp and dib.cpp

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

diff --git a/samples/controls/makefile.g95 b/samples/controls/makefile.g95
index 6ad1b1b2ada6db63e88703e824efb531e74ad5d6..28a81c25cf0d27faaa3d17cb110ad3a522f8ace5 100644 (file)
--- a/samples/controls/makefile.g95
+++ b/samples/controls/makefile.g95
@@ -1,37 +1,16 @@
 #
 #

-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1993
-# Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# File:         makefile.g95
+# Author:       Julian Smart
+# Created:      1999
+# Updated:
+# Copyright:    (c) Julian Smart, 1999

 #
 #

-# "%W% %G%"
-#
-# Makefile for minimal example (UNIX).
+# Makefile for wxWindows sample (Cygwin/Mingw32).

 
 WXDIR = ../..
 
 
 WXDIR = ../..
 

-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/makeg95.env
-
-OBJECTS = $(OBJDIR)/minimal.$(OBJSUFF) $(OBJDIR)/minimal_resources.$(OBJSUFF)
-
-all:    $(OBJDIR) minimal$(GUISUFFIX)$(EXESUFF)
-
-wx:
-
-$(OBJDIR):
-       mkdir $(OBJDIR)
-
-minimal$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB)
-       $(CC) $(LDFLAGS) -o minimal$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
-
-$(OBJDIR)/minimal.$(OBJSUFF):  minimal.$(SRCSUFF)
-       $(CC) -c $(CPPFLAGS) -o $@ minimal.$(SRCSUFF)
+TARGET=controls
+OBJECTS = $(TARGET).o

 
 

-$(OBJDIR)/minimal_resources.o:  minimal.rc
-       $(RESCOMP) -i minimal.rc -o $(OBJDIR)/minimal_resources.o $(RESFLAGS)
+include $(WXDIR)/src/makeprog.g95

 
 

-clean:
-       rm -f $(OBJECTS) minimal$(GUISUFFIX).exe core *.rsc *.res