X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ece5e6a47aef257ddf8488782d34712dbfb3e7f1..884ca4e484c3c867407649c74b6f16a428d31a26:/tests/makefile.gcc?ds=sidebyside

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index 0abb687261..86c0188e44 100644
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -30,6 +30,7 @@ TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
 TEST_OBJECTS =  \
 	$(OBJS)\test_dummy.o \
 	$(OBJS)\test_test.o \
+	$(OBJS)\test_anytest.o \
 	$(OBJS)\test_archivetest.o \
 	$(OBJS)\test_ziptest.o \
 	$(OBJS)\test_tartest.o \
@@ -41,6 +42,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 \
@@ -107,6 +109,7 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_rect.o \
 	$(OBJS)\test_gui_size.o \
 	$(OBJS)\test_gui_point.o \
+	$(OBJS)\test_gui_colour.o \
 	$(OBJS)\test_gui_measuring.o \
 	$(OBJS)\test_gui_config.o \
 	$(OBJS)\test_gui_comboboxtest.o \
@@ -141,11 +144,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)
@@ -175,13 +173,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
@@ -259,13 +252,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
@@ -373,6 +361,9 @@ $(OBJS)\test_dummy.o: ./dummy.cpp
 $(OBJS)\test_test.o: ./test.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_anytest.o: ./any/anytest.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_archivetest.o: ./archive/archivetest.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
@@ -406,6 +397,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) $<
 
@@ -580,6 +574,9 @@ $(OBJS)\test_gui_size.o: ./geometry/size.cpp
 $(OBJS)\test_gui_point.o: ./geometry/point.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_gui_colour.o: ./graphics/colour.cpp
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_gui_measuring.o: ./graphics/measuring.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<