Don't use a destroy event handler to disconnect the native control's delegate as...

[wxWidgets.git] / samples / opengl / isosurf / makefile.unx

diff --git a/samples/opengl/isosurf/makefile.unx b/samples/opengl/isosurf/makefile.unx
index b52d2d7d7c1b9abb19a57bba068b58cc163b40f5..8de8a43116492b7496ef2abbbe0ff2220fcdbf54 100644 (file)
--- a/samples/opengl/isosurf/makefile.unx
+++ b/samples/opengl/isosurf/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.5 (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,7 +11,7 @@
 # -------------------------------------------------------------------------
 
 # C++ compiler 
 # -------------------------------------------------------------------------
 
 # C++ compiler 

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

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


@@ -25,20 +25,17 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
 # Location and arguments of wx-config script 
 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/')

 
 
 
 
 
 


@@ -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)

 ISOSURF_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
        $(CXXFLAGS)
 ISOSURF_OBJECTS =  \
 ISOSURF_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
        $(CXXFLAGS)
 ISOSURF_OBJECTS =  \


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


@@ -98,7 +88,7 @@ test_for_selected_wxbuild:
        @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
 
 isosurf: $(ISOSURF_OBJECTS)
        @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
 
 isosurf: $(ISOSURF_OBJECTS)

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

 
 isosurf_isosurf.o: ./isosurf.cpp
        $(CXX) -c -o $@ $(ISOSURF_CXXFLAGS) $(CPPDEPS) $<
 
 isosurf_isosurf.o: ./isosurf.cpp
        $(CXX) -c -o $@ $(ISOSURF_CXXFLAGS) $(CPPDEPS) $<