fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)

[wxWidgets.git] / samples / joytest / makefile.unx

diff --git a/samples/joytest/makefile.unx b/samples/joytest/makefile.unx
index 7b60c08bea4be9fbfc89e274f6c35cafb863ccc0..23bdc6486ee0138f968833b8614c3332987d5646 100644 (file)
--- a/samples/joytest/makefile.unx
+++ b/samples/joytest/makefile.unx
@@ -1,17 +1,23 @@
-#
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-# Copyright:   (c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for joytest example (UNIX).
+# Purpose: makefile for joytest example (Unix)
+# Created: 2000-03-14
 
-PROGRAM=joytest
+CXX = $(shell wx-config --cxx)
 
-OBJECTS=$(PROGRAM).o
+PROGRAM = joytest
 
-include ../../src/makeprog.env
+OBJECTS = $(PROGRAM).o
 
+# implementation
+
+.SUFFIXES:     .o .cpp
+
+.cpp.o :
+       $(CXX) -c `wx-config --cxxflags` -o $@ $<
+
+all:    $(PROGRAM)
+
+$(PROGRAM):    $(OBJECTS)
+       $(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+
+clean:
+       rm -f *.o $(PROGRAM)