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 a4d7ac2aad77c71e78134defed8cfcfa66c21bff..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.4 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -11,7 +11,7 @@
 # -------------------------------------------------------------------------
 
 # C++ compiler 
-CXX ?= g++
+CXX = g++
 
 # Standard flags for C++ 
 CXXFLAGS ?= 
@@ -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: ###
 
@@ -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