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

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

diff --git a/samples/scroll/makefile.unx b/samples/scroll/makefile.unx
index 57d2bcdc931f02baba469ab159bee75da1ede741..160983e3b4a95555d9966960e46adaf56f3a8223 100644 (file)
--- a/samples/scroll/makefile.unx
+++ b/samples/scroll/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #
 
 # under Linux.
 #
 

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

 
 PROGRAM = scroll
 
 
 PROGRAM = scroll
 


@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:     .o .cpp
 
 .cpp.o :
 .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)