(blind) compilation fixes for OS X 10.2

[wxWidgets.git] / tests / Makefile.in

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 24fd82282a00713c365648da48b4322d4bc16654..2eec2e292dc933eca628df95284608befd3966fb 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -78,7 +78,9 @@ TEST_GUI_OBJECTS =  \
        $(__test_gui___win32rc) \
        $(__test_gui_os2_lib_res) \
        test_gui_test.o \
-       test_gui_rect.o
+       test_gui_rect.o \
+       test_gui_size.o \
+       test_gui_point.o
 TEST_GUI_ODEP =  $(___pch_testprec_test_gui_testprec_h_gch___depname)
 
 ### Conditionally set variables: ###
@@ -181,7 +183,8 @@ distclean: clean
 test$(EXEEXT): $(TEST_OBJECTS)
        $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
        
-       $(__test___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK)
+       $(__test___mac_setfilecmd)
+       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_GCC_PCH_1@.pch/testprec_test/testprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/testprec_test/testprec.h.gch testprec.h $(CXX) $(TEST_CXXFLAGS)
@@ -189,7 +192,8 @@ test$(EXEEXT): $(TEST_OBJECTS)
 @COND_USE_GUI_1@test_gui$(EXEEXT): $(TEST_GUI_OBJECTS) $(__test_gui___win32rc)
 @COND_USE_GUI_1@       $(CXX) -o $@ $(TEST_GUI_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS)   $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI)
 @COND_USE_GUI_1@       $(__test_gui___mac_rezcmd)
-@COND_USE_GUI_1@       $(__test_gui___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK)
+@COND_USE_GUI_1@       $(__test_gui___mac_setfilecmd)
+@COND_USE_GUI_1@       $(SAMPLES_RPATH_POSTLINK)
 
 test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p test_gui.app/Contents
@@ -318,6 +322,12 @@ test_gui_test.o: $(srcdir)/test.cpp $(TEST_GUI_ODEP)
 test_gui_rect.o: $(srcdir)/geometry/rect.cpp $(TEST_GUI_ODEP)
        $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $<
 
+test_gui_size.o: $(srcdir)/geometry/size.cpp $(TEST_GUI_ODEP)
+       $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $<
+
+test_gui_point.o: $(srcdir)/geometry/point.cpp $(TEST_GUI_ODEP)
+       $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $<
+
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d