Re-added a minimal setup.h file that includes wx/msw/setup.h on Windows,

[wxWidgets.git] / demos / life / makefile.unx

diff --git a/demos/life/makefile.unx b/demos/life/makefile.unx
index c90364860520dc1f616717a25b1e940cd7a73da8..a39e968d176dbd94db0fdf99359e4f7b7ae98cc0 100644 (file)
--- a/demos/life/makefile.unx
+++ b/demos/life/makefile.unx
@@ -13,23 +13,23 @@
 # under Linux.
 #
 
 # under Linux.
 #
 

-CC = gcc
+CXX = $(shell wx-config --cxx)

 
 PROGRAM = life
 
 
 PROGRAM = life
 

-OBJECTS = $(PROGRAM).o
+OBJECTS = $(PROGRAM).o dialogs.o game.o reader.o

 
 # implementation
 
 .SUFFIXES:     .o .cpp
 
 .cpp.o :
 
 # implementation
 
 .SUFFIXES:     .o .cpp
 
 .cpp.o :

-       $(CC) -c `wx-config --cflags` -o $@ $<
+       $(CXX) -c `wx-config --cxxflags` -o $@ $<

 
 all:    $(PROGRAM)
 
 $(PROGRAM):    $(OBJECTS)
 
 all:    $(PROGRAM)
 
 $(PROGRAM):    $(OBJECTS)

-       $(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+       $(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 
 clean: 
        rm -f *.o $(PROGRAM)
 
 clean: 
        rm -f *.o $(PROGRAM)