use wxDC::GetMultiLineTextExtent() instead of duplicating its code in wxButton::DoGet...

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

diff --git a/samples/minimal/makefile.unx b/samples/minimal/makefile.unx
index 7ca58131fc09f5a4eee8220b9a9d6796ebfce1af..2e6be9375fa97e641efe8c25e23956f266ed11a3 100644 (file)
--- a/samples/minimal/makefile.unx
+++ b/samples/minimal/makefile.unx
@@ -11,25 +11,39 @@
 # sources of wxWindows or by installing the two
 # RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
 # under Linux.
 # sources of wxWindows or by installing the two
 # RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
 # under Linux.

-#

 
 

-CC = gcc
+# this makefile may also be used as a template for simple makefiles for your
+# own programs, the comments explain which parts of it you may have to modify
+# to use it for your own programs
+

 
 

+# you may change WX_CONFIG value to use a specific wx-config and to pass it
+# some options, for example "--inplace" to use an uninstalled wxWindows
+# version
+#
+# by default, wx-config from the PATH is used
+WX_CONFIG := wx-config
+
+# set this to the name of the main executable file

 PROGRAM = minimal
 
 PROGRAM = minimal
 

+# if your program has more than one source file, add more .o files to the line
+# below

 OBJECTS = $(PROGRAM).o
 
 OBJECTS = $(PROGRAM).o
 

-# implementation
+
+# you shouldn't have to edit anything below this line
+CXX = $(shell $(WX_CONFIG) --cxx)

 
 .SUFFIXES:     .o .cpp
 
 .cpp.o :
 
 .SUFFIXES:     .o .cpp
 
 .cpp.o :

-       $(CC) -c `wx-config --cxxflags` -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)