Fix discrepancy between different ways of measuring text extents under Mac.

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

diff --git a/samples/oleauto/makefile.unx b/samples/oleauto/makefile.unx
index 934492bbcca2e4f54f67046a815cf688712abc82..d52ec1cd49848e642e70ccaecaace39ece7012ef 100644 (file)
--- a/samples/oleauto/makefile.unx
+++ b/samples/oleauto/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -11,34 +11,31 @@
 # -------------------------------------------------------------------------
 
 # C++ compiler 
 # -------------------------------------------------------------------------
 
 # C++ compiler 

-CXX := g++
+CXX = `$(WX_CONFIG) --cxx`

 
 # Standard flags for C++ 
 
 # Standard flags for C++ 

-CXXFLAGS := 
+CXXFLAGS ?= 

 
 # Standard preprocessor flags (common for CC and CXX) 
 
 # Standard preprocessor flags (common for CC and CXX) 

-CPPFLAGS := 
+CPPFLAGS ?= 

 
 # Standard linker flags 
 
 # Standard linker flags 

-LDFLAGS := 
+LDFLAGS ?= 

 
 # Location and arguments of wx-config script 
 
 # 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,mgl,osx_cocoa,osx_carbon,dfb]
+WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)

 
 # Use DLL build of wx library to use? [0,1]
 
 # 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]
 
 # 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. 
 
 # 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: ###
 
 
 ### 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_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)

 OLEAUTO_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
        $(CXXFLAGS)
 OLEAUTO_OBJECTS =  \
 OLEAUTO_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
        $(CXXFLAGS)
 OLEAUTO_OBJECTS =  \


@@ -61,12 +57,6 @@ OLEAUTO_OBJECTS =  \
 
 ### Conditionally set variables: ###
 
 
 ### 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
 ifeq ($(WX_UNICODE),0)
 WX_CONFIG_UNICODE_FLAG = --unicode=no
 endif


@@ -85,7 +75,7 @@ endif
 
 all: test_for_selected_wxbuild oleauto
 
 
 all: test_for_selected_wxbuild oleauto
 

-install: all
+install: 

 
 uninstall: 
 
 
 uninstall: 
 


@@ -98,7 +88,7 @@ test_for_selected_wxbuild:
        @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
 
 oleauto: $(OLEAUTO_OBJECTS)
        @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
 
 oleauto: $(OLEAUTO_OBJECTS)

-       $(CXX) -o $@ $(OLEAUTO_OBJECTS) $(LDFLAGS)  `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base`
+       $(CXX) -o $@ $(OLEAUTO_OBJECTS)   $(LDFLAGS)  `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base`

 
 oleauto_oleauto.o: ./oleauto.cpp
        $(CXX) -c -o $@ $(OLEAUTO_CXXFLAGS) $(CPPDEPS) $<
 
 oleauto_oleauto.o: ./oleauto.cpp
        $(CXX) -c -o $@ $(OLEAUTO_CXXFLAGS) $(CPPDEPS) $<