more order in wxCRT_filefunctions: define A and W versions, just as for everything...

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

diff --git a/samples/image/makefile.unx b/samples/image/makefile.unx
index ec27760bfcc431526ed06750f71b115940dae0dd..15e1a00c675ab0e310cf1bcda2bcf9b2385d3a24 100644 (file)
--- a/samples/image/makefile.unx
+++ b/samples/image/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -11,34 +11,34 @@
 # -------------------------------------------------------------------------
 
 # C++ compiler 
-CXX := g++
+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,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 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) --selected-config | cut -d '-' -f 5`; 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/')
+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_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/')
 
 
 
@@ -57,7 +57,8 @@ WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \
 IMAGE_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
        $(CXXFLAGS)
 IMAGE_OBJECTS =  \
-       image_image.o
+       image_image.o \
+       image_canvas.o
 
 ### Conditionally set variables: ###
 
@@ -85,7 +86,7 @@ endif
 
 all: test_for_selected_wxbuild image
 
-install: all
+install: 
 
 uninstall: 
 
@@ -98,11 +99,14 @@ test_for_selected_wxbuild:
        @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
 
 image: $(IMAGE_OBJECTS)
-       $(CXX) -o $@ $(IMAGE_OBJECTS)   `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS)
+       $(CXX) -o $@ $(IMAGE_OBJECTS)   $(LDFLAGS)  `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base`
 
 image_image.o: ./image.cpp
        $(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<
 
+image_canvas.o: ./canvas.cpp
+       $(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<
+
 .PHONY: all install uninstall clean