Avoid incompatible operand types

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

diff --git a/samples/xrc/makefile.unx b/samples/xrc/makefile.unx
index d560df5a2d6b7d14f4d6a58332fc681b73c85b4d..6e8df683cf15526c8bf3615f5a36ca08c31aeb19 100644 (file)
--- a/samples/xrc/makefile.unx
+++ b/samples/xrc/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.8 (http://www.bakefile.org)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -25,7 +25,7 @@ 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]
+# 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]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]


@@ -56,7 +56,8 @@ XRCDEMO_OBJECTS =  \
        xrcdemo_xrcdemo.o \
        xrcdemo_myframe.o \
        xrcdemo_derivdlg.o \
        xrcdemo_xrcdemo.o \
        xrcdemo_myframe.o \
        xrcdemo_derivdlg.o \

-       xrcdemo_custclas.o
+       xrcdemo_custclas.o \
+       xrcdemo_objrefdlg.o

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 


@@ -105,6 +106,9 @@ xrcdemo_derivdlg.o: ./derivdlg.cpp
 xrcdemo_custclas.o: ./custclas.cpp
        $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $<
 
 xrcdemo_custclas.o: ./custclas.cpp
        $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $<
 

+xrcdemo_objrefdlg.o: ./objrefdlg.cpp
+       $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $<
+

 .PHONY: all install uninstall clean
 
 
 .PHONY: all install uninstall clean