Change wxBoxSizer::AddSpacer() to only add space in sizer direction.

[wxWidgets.git] / tests / makefile.gcc

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index fdeaf137e3b3cf50061738aecafbbb641b78f3da..08f2802a74abb71ccb5189ff3698134990ed19eb 100644 (file)
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -41,6 +41,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_evthandler.o \
        $(OBJS)\test_timertest.o \
        $(OBJS)\test_exec.o \
+       $(OBJS)\test_filetest.o \
        $(OBJS)\test_filekind.o \
        $(OBJS)\test_filenametest.o \
        $(OBJS)\test_filesystest.o \
@@ -49,6 +50,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_hashes.o \
        $(OBJS)\test_intltest.o \
        $(OBJS)\test_lists.o \
+       $(OBJS)\test_logtest.o \
        $(OBJS)\test_longlongtest.o \
        $(OBJS)\test_convautotest.o \
        $(OBJS)\test_mbconvtest.o \
@@ -86,6 +88,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_queue.o \
        $(OBJS)\test_tls.o \
        $(OBJS)\test_uris.o \
+       $(OBJS)\test_url.o \
        $(OBJS)\test_vectors.o \
        $(OBJS)\test_evtconnection.o \
        $(OBJS)\test_weakref.o \
@@ -116,6 +119,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_clone.o \
        $(OBJS)\test_gui_propagation.o \
        $(OBJS)\test_gui_fonttest.o \
+       $(OBJS)\test_gui_image.o \
        $(OBJS)\test_gui_rawbmp.o \
        $(OBJS)\test_gui_htmlwindow.o \
        $(OBJS)\test_gui_guifuncs.o \
@@ -138,11 +142,6 @@ ifeq ($(USE_GUI),1)
 PORTNAME = msw
 endif
 ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
 WXDEBUGFLAG = d
 endif
 ifeq ($(UNICODE),1)
@@ -172,13 +171,8 @@ endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p_3 = --define __WXUNIVERSAL__
 endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_3 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_3 = --define __WXDEBUG__
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_3 = --define wxDEBUG_LEVEL=0
 endif
 ifeq ($(USE_EXCEPTIONS),0)
 __EXCEPTIONS_DEFINE_p_3 = --define wxNO_EXCEPTIONS
@@ -256,13 +250,8 @@ endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
 endif
 ifeq ($(USE_EXCEPTIONS),0)
 __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
@@ -358,7 +347,7 @@ endif
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
-       for %%f in (testdata.fc) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+       for %%f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
 fr: 
        if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr
@@ -403,6 +392,9 @@ $(OBJS)\test_timertest.o: ./events/timertest.cpp
 $(OBJS)\test_exec.o: ./exec/exec.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_filetest.o: ./file/filetest.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_filekind.o: ./filekind/filekind.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
@@ -427,6 +419,9 @@ $(OBJS)\test_intltest.o: ./intl/intltest.cpp
 $(OBJS)\test_lists.o: ./lists/lists.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_logtest.o: ./log/logtest.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_longlongtest.o: ./longlong/longlongtest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
@@ -538,6 +533,9 @@ $(OBJS)\test_tls.o: ./thread/tls.cpp
 $(OBJS)\test_uris.o: ./uris/uris.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_url.o: ./uris/url.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_vectors.o: ./vectors/vectors.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
@@ -604,6 +602,9 @@ $(OBJS)\test_gui_propagation.o: ./events/propagation.cpp
 $(OBJS)\test_gui_fonttest.o: ./font/fonttest.cpp
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_gui_image.o: ./image/image.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_gui_rawbmp.o: ./image/rawbmp.cpp
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<