added wxICON_NONE and implement support for it in wxGTK (closes #2897)

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

diff --git a/samples/dialogs/makefile.unx b/samples/dialogs/makefile.unx
index 19a83657a806a3646387b3811807f317a252d306..93ba87eeffcd25d00b0e27fad18088314b56c8d3 100644 (file)
--- a/samples/dialogs/makefile.unx
+++ b/samples/dialogs/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     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!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -11,7 +11,7 @@
 # -------------------------------------------------------------------------
 
 # C++ compiler 
 # -------------------------------------------------------------------------
 
 # C++ compiler 

-CXX ?= g++
+CXX = g++

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


@@ -98,7 +98,7 @@ test_for_selected_wxbuild:
        @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
 
 dialogs: $(DIALOGS_OBJECTS)
        @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
 
 dialogs: $(DIALOGS_OBJECTS)

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

 
 dialogs_dialogs.o: ./dialogs.cpp
        $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<
 
 dialogs_dialogs.o: ./dialogs.cpp
        $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<