fixing infinite recursion for rotated text, introduced in cleanup r57915

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

diff --git a/samples/widgets/makefile.unx b/samples/widgets/makefile.unx
index 5d1572e1b2f682ac52a2504c70da63e93bffdb94..16e52f6d4120f3d037a42ff4ab393446f0fffac9 100644 (file)
--- a/samples/widgets/makefile.unx
+++ b/samples/widgets/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.5 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -14,31 +14,31 @@
 CXX = g++
 
 # Standard flags for C++ 
-CXXFLAGS = 
+CXXFLAGS ?= 
 
 # Standard preprocessor flags (common for CC and CXX) 
-CPPFLAGS = 
+CPPFLAGS ?= 
 
 # Standard linker flags 
-LDFLAGS = 
+LDFLAGS ?= 
 
 # Location and arguments of wx-config script 
-WX_CONFIG = wx-config
+WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,$(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)]
-WX_PORT = $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
 
-# Use DLL build of wx library to use? [0,1,$(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)]
-WX_SHARED = $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+# Use DLL build of wx library to use? [0,1]
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
 
-# Compile Unicode build of wxWidgets? [0,1,$(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')]
-WX_UNICODE = $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+# Compile Unicode build of wxWidgets? [0,1]
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
 
-# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1,$(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')]
-WX_DEBUG = $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
 
 # Version of the wx library to build against. 
-WX_VERSION = $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
 
 
 
@@ -48,7 +48,7 @@ WX_VERSION = $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\
 
 ### Variables: ###
 
-CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD
+CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP
 WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1)
 WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2)
 WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \
@@ -60,15 +60,18 @@ WIDGETS_OBJECTS =  \
        widgets_bmpcombobox.o \
        widgets_button.o \
        widgets_checkbox.o \
+       widgets_choice.o \
        widgets_clrpicker.o \
        widgets_combobox.o \
        widgets_datepick.o \
        widgets_dirctrl.o \
        widgets_dirpicker.o \
+       widgets_filectrl.o \
        widgets_filepicker.o \
        widgets_fontpicker.o \
        widgets_gauge.o \
        widgets_hyperlnk.o \
+       widgets_itemcontainer.o \
        widgets_listbox.o \
        widgets_notebook.o \
        widgets_odcombobox.o \
@@ -77,6 +80,7 @@ WIDGETS_OBJECTS =  \
        widgets_slider.o \
        widgets_spinbtn.o \
        widgets_static.o \
+       widgets_statbmp.o \
        widgets_textctrl.o \
        widgets_toggle.o \
        widgets_widgets.o
@@ -107,7 +111,7 @@ endif
 
 all: test_for_selected_wxbuild widgets
 
-install: all
+install: 
 
 uninstall: 
 
@@ -120,7 +124,7 @@ test_for_selected_wxbuild:
        @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
 
 widgets: $(WIDGETS_OBJECTS)
-       $(CXX) -o $@ $(WIDGETS_OBJECTS) $(LDFLAGS)   `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs xml,adv,html,core,base`
+       $(CXX) -o $@ $(WIDGETS_OBJECTS)   `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS)
 
 widgets_bmpcombobox.o: ./bmpcombobox.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
@@ -131,6 +135,9 @@ widgets_button.o: ./button.cpp
 widgets_checkbox.o: ./checkbox.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
+widgets_choice.o: ./choice.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
 widgets_clrpicker.o: ./clrpicker.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
@@ -146,6 +153,9 @@ widgets_dirctrl.o: ./dirctrl.cpp
 widgets_dirpicker.o: ./dirpicker.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
+widgets_filectrl.o: ./filectrl.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
 widgets_filepicker.o: ./filepicker.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
@@ -158,6 +168,9 @@ widgets_gauge.o: ./gauge.cpp
 widgets_hyperlnk.o: ./hyperlnk.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
+widgets_itemcontainer.o: ./itemcontainer.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
 widgets_listbox.o: ./listbox.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
@@ -182,6 +195,9 @@ widgets_spinbtn.o: ./spinbtn.cpp
 widgets_static.o: ./static.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
+widgets_statbmp.o: ./statbmp.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
 widgets_textctrl.o: ./textctrl.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<