X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbc459f6526739f2ba2db8223bcf6e16739e22b0..8ecd5de22748b434c085a3c2af8a57fc95607231:/Makefile.in?ds=sidebyside

diff --git a/Makefile.in b/Makefile.in
index 05867cb099..bd9d5a272e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -45,6 +45,7 @@ LDFLAGS = @LDFLAGS@
 VENDOR = @VENDOR@
 WX_FLAVOUR = @WX_FLAVOUR@
 WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
+REZ = @REZ@
 DEREZ = @DEREZ@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
@@ -1242,6 +1243,7 @@ XRCDLL_OBJECTS =  \
 	xrcdll_xh_mdi.o \
 	xrcdll_xh_gauge.o \
 	xrcdll_xh_gdctl.o \
+	xrcdll_xh_grid.o \
 	xrcdll_xh_html.o \
 	xrcdll_xh_listb.o \
 	xrcdll_xh_listbk.o \
@@ -1292,6 +1294,7 @@ XRCLIB_OBJECTS =  \
 	xrclib_xh_mdi.o \
 	xrclib_xh_gauge.o \
 	xrclib_xh_gdctl.o \
+	xrclib_xh_grid.o \
 	xrclib_xh_html.o \
 	xrclib_xh_listb.o \
 	xrclib_xh_listbk.o \
@@ -2716,6 +2719,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/xrc/xh_mdi.h \
 	wx/xrc/xh_gauge.h \
 	wx/xrc/xh_gdctl.h \
+	wx/xrc/xh_grid.h \
 	wx/xrc/xh_html.h \
 	wx/xrc/xh_listb.h \
 	wx/xrc/xh_listbk.h \
@@ -2992,6 +2996,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
 	monodll_xh_mdi.o \
 	monodll_xh_gauge.o \
 	monodll_xh_gdctl.o \
+	monodll_xh_grid.o \
 	monodll_xh_html.o \
 	monodll_xh_listb.o \
 	monodll_xh_listbk.o \
@@ -4470,6 +4475,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
 	monolib_xh_mdi.o \
 	monolib_xh_gauge.o \
 	monolib_xh_gdctl.o \
+	monolib_xh_grid.o \
 	monolib_xh_html.o \
 	monolib_xh_listb.o \
 	monolib_xh_listbk.o \
@@ -9970,7 +9976,7 @@ locale_msw_install:
 	done
 
 @COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).0.r: 
-@COND_TOOLKIT_COCOA@	$(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).0.rsrc
+@COND_TOOLKIT_COCOA@	$(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).0.rsrc
 @COND_TOOLKIT_COCOA@	$(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).0.r
 
 @COND_TOOLKIT_COCOA@cocoa-res-install: $(__cocoa_res___depname)
@@ -10967,6 +10973,9 @@ monodll_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(MONODLL_ODEP)
 monodll_xh_gdctl.o: $(srcdir)/src/xrc/xh_gdctl.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_gdctl.cpp
 
+monodll_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
+
 monodll_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp
 
@@ -14453,6 +14462,9 @@ monolib_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(MONOLIB_ODEP)
 monolib_xh_gdctl.o: $(srcdir)/src/xrc/xh_gdctl.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_gdctl.cpp
 
+monolib_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
+
 monolib_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp
 
@@ -24215,6 +24227,9 @@ xrcdll_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(XRCDLL_ODEP)
 xrcdll_xh_gdctl.o: $(srcdir)/src/xrc/xh_gdctl.cpp $(XRCDLL_ODEP)
 	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_gdctl.cpp
 
+xrcdll_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(XRCDLL_ODEP)
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
+
 xrcdll_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(XRCDLL_ODEP)
 	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp
 
@@ -24347,6 +24362,9 @@ xrclib_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(XRCLIB_ODEP)
 xrclib_xh_gdctl.o: $(srcdir)/src/xrc/xh_gdctl.cpp $(XRCLIB_ODEP)
 	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_gdctl.cpp
 
+xrclib_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(XRCLIB_ODEP)
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
+
 xrclib_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(XRCLIB_ODEP)
 	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp