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 c4156423acf268eeecdb6fd70c0d570d6b5036a4..23bdc6486ee0138f968833b8614c3332987d5646 100644 (file)
--- a/samples/joytest/makefile.unx
+++ b/samples/joytest/makefile.unx
@@ -1,55 +1,23 @@
-#
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1993
-# Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile for joytest example (UNIX).
+# Purpose: makefile for joytest example (Unix)
+# Created: 2000-03-14
 
-WXDIR = ../..
+CXX = $(shell wx-config --cxx)
 
-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/make.env
+PROGRAM = joytest
 
-OBJECTS = $(OBJDIR)/joytest.$(OBJSUFF)
+OBJECTS = $(PROGRAM).o
 
-.SUFFIXES:
+# implementation
 
-all:    $(OBJDIR) joytest$(GUISUFFIX)
+.SUFFIXES:     .o .cpp
 
-wx:
-#      cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx
-motif:
-       $(MAKE) -f makefile.unx GUISUFFIX=_motif GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)' OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)' XVIEW_LINK=
+.cpp.o :
+       $(CXX) -c `wx-config --cxxflags` -o $@ $<
 
-xview:
-       $(MAKE) -f makefile.unx GUI=-Dwx_xview GUISUFFIX=_ol CC=$(CC) OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
+all:    $(PROGRAM)
 
-hp:
-       $(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_hp CC=CC DEBUG='$(DEBUG)' WARN='-w' \
-         XINCLUDE='$(HPXINCLUDE)' XLIB='$(HPXLIB)' XVIEW_LINK='' LDLIBS='$(HPLDLIBS)'
+$(PROGRAM):    $(OBJECTS)
+       $(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
-$(OBJDIR):
-       mkdir $(OBJDIR)
-
-joytest$(GUISUFFIX): $(OBJDIR)/joytest.$(OBJSUFF) $(WXLIB)
-       $(CC) $(LDFLAGS) -o joytest$(GUISUFFIX) $(OBJDIR)/joytest.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
-
-$(OBJDIR)/joytest.$(OBJSUFF):        joytest.$(SRCSUFF) joytest.h
-       $(CC) -c $(CPPFLAGS) -o $@ joytest.$(SRCSUFF)
-
-clean_motif:
-       $(MAKE) -f makefile.unx GUISUFFIX=_motif cleanany
-
-clean_ol:
-       $(MAKE) -f makefile.unx GUISUFFIX=_ol cleanany
-
-clean_hp:
-       $(MAKE) -f makefile.unx GUISUFFIX=_hp cleanany
-
-cleanany:
-       rm -f $(OBJECTS) joytest$(GUISUFFIX) core
+clean:
+       rm -f *.o $(PROGRAM)