Add a test of precisely sized status bar fields.

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

diff --git a/samples/taskbar/makefile.unx b/samples/taskbar/makefile.unx
index c02b205c0e2fa5013790e273d595df510053a8be..340109f975c7d05fb8b6e56d4ff6bd29cb3db112 100644 (file)
--- a/samples/taskbar/makefile.unx
+++ b/samples/taskbar/makefile.unx
@@ -11,7 +11,7 @@
 # -------------------------------------------------------------------------
 
 # C++ compiler 
 # -------------------------------------------------------------------------
 
 # C++ compiler 

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

 
 # Standard flags for C++ 
 CXXFLAGS ?= 
 
 # Standard flags for C++ 
 CXXFLAGS ?= 


@@ -26,19 +26,16 @@ LDFLAGS ?=
 WX_CONFIG ?= wx-config
 
 # Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
 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)
+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/')

 
 
 
 
 
 


@@ -51,9 +48,8 @@ WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.
 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)
 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)

 TASKBAR_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
        $(CXXFLAGS)
 TASKBAR_OBJECTS =  \
 TASKBAR_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
        $(CXXFLAGS)
 TASKBAR_OBJECTS =  \


@@ -61,12 +57,6 @@ TASKBAR_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