merged 2.2 branch

[wxWidgets.git] / contrib / samples / ogl / studio / makefile.unx

diff --git a/contrib/samples/ogl/studio/makefile.unx b/contrib/samples/ogl/studio/makefile.unx
index 5fca57a097e45433f4f78de287cf0938b31a8932..2070bc3b1303788a6f7c5d3949a61c76c87f0ff2 100644 (file)
--- a/contrib/samples/ogl/studio/makefile.unx
+++ b/contrib/samples/ogl/studio/makefile.unx
@@ -1,39 +1,57 @@
 #
-# File:                makefile.unx
+# File:                Makefile
 # Author:      Julian Smart
-# Created:     1998
+# Created:     1999
 # Updated:     
-# Copyright:   (c) 1998 Julian Smart
+# Copyright:   (c) 2000 Julian Smart
 #
-# "%W% %G%"
+# Makefile for OGL demo (GTK version)
 #
-# Makefile for OGL Studio (UNIX).
+# This makefile requires wxWindows/GTK to be 
+# installed (possibly using "make install")
+# on your system.
+#
+
+CPP = gcc -g
+CC = gcc
+WXCONFIG=../../../../wx-config
+WXINCLUDE=-I../../../../include -I../../../include
+WXLIB=-L../../../../lib -L../../../src/ogl
+
+OBJECTS=studio.o cspalette.o csprint.o dialogs.o doc.o mainfrm.o project.o shapes.o symbols.o view.o
 
-PROGRAM=studio
+studio: $(OBJECTS)
+       $(CPP) -o studio $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl
 
-OBJECTS=$(PROGRAM).o doc.o shapes.o symbols.o view.o cspalette.o\
-  mainfrm.o project.o dialogs.o csprint.o
+studio.o: studio.cpp
+       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c studio.cpp
 
-EXTRACPPFLAGS=-I$(WXDIR)/utils/ogl/src -I./bitmaps
-EXTRALDLIBS=-logl$(GUISUFFIX)
+cspalette.o: cspalette.cpp
+       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c cspalette.cpp
 
-#WXDIR=/home/jacs/wx2
+doc.o: doc.cpp
+       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c doc.cpp
 
-include $(WXDIR)/src/makeprog.env
+view.o: view.cpp
+       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c view.cpp
 
-cleanogl:
-       cd $(WXDIR)/utils/ogl/src; make -f makefile.unx cleanmotif
+dialogs.o: dialogs.cpp
+       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c dialogs.cpp
 
-ogl:
-       cd $(WXDIR)/utils/ogl/src; make -f makefile.unx motif
+mainfrm.o: mainfrm.cpp
+       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c mainfrm.cpp
 
-wx:
-       cd $(WXDIR)/src/motif; make -f makefile.unx motif
+project.o: project.cpp
+       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c project.cpp
 
-cleanwx:
-       cd $(WXDIR)/src/motif; make -f makefile.unx cleanmotif
+shapes.o: shapes.cpp
+       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c shapes.cpp
 
-cleanall: cleanmotif cleanogl cleanwx
+symbols.o: symbols.cpp
+       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c symbols.cpp
 
-makeall: wx ogl motif
+csprint.o: csprint.cpp
+       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c csprint.cpp
 
+clean: 
+       rm -f *.o studio