build a 2.9.x windows setup file and chm and htb sets of docs

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

diff --git a/samples/dataview/makefile.unx b/samples/dataview/makefile.unx
index 73db99a216c0612fb7180caceb9ae7d24e2adf58..b87147b106ab7e4ff03480df28720573e0fbbacf 100644 (file)
--- a/samples/dataview/makefile.unx
+++ b/samples/dataview/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.4 (http://www.bakefile.org)
+#     Bakefile 0.2.5 (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) \
 DATAVIEW_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
        $(CXXFLAGS)
 DATAVIEW_OBJECTS =  \
-       dataview_dataview.o
+       dataview_dataview.o \
+       dataview_mymodels.o
 
 ### Conditionally set variables: ###
 
@@ -98,11 +99,14 @@ test_for_selected_wxbuild:
        @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
 
 dataview: $(DATAVIEW_OBJECTS)
-       $(CXX) -o $@ $(DATAVIEW_OBJECTS)   `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS)
+       $(CXX) -o $@ $(DATAVIEW_OBJECTS)   $(LDFLAGS)  `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base`
 
 dataview_dataview.o: ./dataview.cpp
        $(CXX) -c -o $@ $(DATAVIEW_CXXFLAGS) $(CPPDEPS) $<
 
+dataview_mymodels.o: ./mymodels.cpp
+       $(CXX) -c -o $@ $(DATAVIEW_CXXFLAGS) $(CPPDEPS) $<
+
 .PHONY: all install uninstall clean