X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a236aa2058ccf3d36e9cafc20fa7375080c4be50..8d9eee83203dfc7177cd8639c14a5c809085698d:/samples/widgets/makefile.unx?ds=sidebyside

diff --git a/samples/widgets/makefile.unx b/samples/widgets/makefile.unx
index 5a2096c8d0..88a6688eb6 100644
--- a/samples/widgets/makefile.unx
+++ b/samples/widgets/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.9 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -11,34 +11,31 @@
 # -------------------------------------------------------------------------
 
 # C++ compiler 
-CXX := g++
+CXX = `$(WX_CONFIG) --cxx`
 
 # 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,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
+WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # 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)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --query-linkage`; then echo 1; else echo 0; fi)
 
 # 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]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --query-chartype | sed 's/unicode/1/;s/ansi/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) --query-version | sed -e 's/\([0-9]*\)\.\([0-9]*\)/\1\2/')
 
 
 
@@ -48,12 +45,11 @@ 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) \
-	$(WX_CONFIG_SHARED_FLAG) --toolkit=$(WX_PORT) \
-	--version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
+WX_CONFIG_FLAGS = $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG) \
+	--toolkit=$(WX_PORT) --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
 WIDGETS_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
 	$(CXXFLAGS)
 WIDGETS_OBJECTS =  \
@@ -66,6 +62,8 @@ WIDGETS_OBJECTS =  \
 	widgets_datepick.o \
 	widgets_dirctrl.o \
 	widgets_dirpicker.o \
+	widgets_editlbox.o \
+	widgets_filectrl.o \
 	widgets_filepicker.o \
 	widgets_fontpicker.o \
 	widgets_gauge.o \
@@ -79,18 +77,14 @@ WIDGETS_OBJECTS =  \
 	widgets_slider.o \
 	widgets_spinbtn.o \
 	widgets_static.o \
+	widgets_statbmp.o \
 	widgets_textctrl.o \
+	widgets_timepick.o \
 	widgets_toggle.o \
 	widgets_widgets.o
 
 ### Conditionally set variables: ###
 
-ifeq ($(WX_DEBUG),0)
-WX_CONFIG_DEBUG_FLAG = --debug=no
-endif
-ifeq ($(WX_DEBUG),1)
-WX_CONFIG_DEBUG_FLAG = --debug=yes
-endif
 ifeq ($(WX_UNICODE),0)
 WX_CONFIG_UNICODE_FLAG = --unicode=no
 endif
@@ -109,7 +103,7 @@ endif
 
 all: test_for_selected_wxbuild widgets
 
-install: all
+install: 
 
 uninstall: 
 
@@ -122,7 +116,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)   $(LDFLAGS)  `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base`
 
 widgets_bmpcombobox.o: ./bmpcombobox.cpp
 	$(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
@@ -151,6 +145,12 @@ widgets_dirctrl.o: ./dirctrl.cpp
 widgets_dirpicker.o: ./dirpicker.cpp
 	$(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
+widgets_editlbox.o: ./editlbox.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) $<
 
@@ -190,9 +190,15 @@ 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) $<
 
+widgets_timepick.o: ./timepick.cpp
+	$(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
 widgets_toggle.o: ./toggle.cpp
 	$(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<