wxComboControl and wxOwnerDrawnComboBox (patch 1479938)

[wxWidgets.git] / tests / makefile.gcc

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index 68f30d0903106ec8d30d2c29c1589878763a305d..b3283c6c455ec8d24999d0913d401442939de49f 100644 (file)
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -13,7 +13,7 @@ include ../build/msw/config.gcc
 ### Variables: ###
 
 CPPDEPS = -MT$@ -MF$@.d -MD
-WX_RELEASE_NODOT = 26
+WX_RELEASE_NODOT = 27
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
@@ -22,8 +22,8 @@ SETUPHDIR = \
 TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I.\..\include -I$(SETUPHDIR) -W -Wall -I. \
-       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(__RTTIFLAG) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include -W \
+       -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(__RTTIFLAG) \
        $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 TEST_OBJECTS =  \
        $(OBJS)\test_dummy.o \
@@ -41,12 +41,14 @@ TEST_OBJECTS =  \
        $(OBJS)\test_hashes.o \
        $(OBJS)\test_lists.o \
        $(OBJS)\test_longlongtest.o \
+       $(OBJS)\test_convautotest.o \
        $(OBJS)\test_mbconvtest.o \
        $(OBJS)\test_regextest.o \
        $(OBJS)\test_wxregextest.o \
        $(OBJS)\test_scopeguardtest.o \
        $(OBJS)\test_strings.o \
        $(OBJS)\test_stdstrings.o \
+       $(OBJS)\test_tokenizer.o \
        $(OBJS)\test_unicode.o \
        $(OBJS)\test_crt.o \
        $(OBJS)\test_bstream.o \
@@ -59,14 +61,15 @@ TEST_OBJECTS =  \
        $(OBJS)\test_tempfile.o \
        $(OBJS)\test_textstreamtest.o \
        $(OBJS)\test_zlibstream.o \
+       $(OBJS)\test_textfiletest.o \
        $(OBJS)\test_uris.o
 TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\include -I$(SETUPHDIR) -W \
-       -Wall -I. $(__DLLFLAG_p) -I.\..\samples -DNOPCH $(CPPUNIT_CFLAGS) \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
-       $(CXXFLAGS)
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       -I$(SETUPHDIR) -I.\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\samples \
+       -DNOPCH $(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_sample_rc.o \
        $(OBJS)\test_gui_dummy.o \
@@ -145,6 +148,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_3 = --define _UNICODE
 endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_3 = --define wxUSE_UNICODE_MSLU=1
+endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p_3 = --define WXUSINGDLL
 endif
@@ -193,6 +199,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -D_UNICODE
 endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p = -DWXUSINGDLL
 endif
@@ -311,6 +320,9 @@ $(OBJS)\test_lists.o: ./lists/lists.cpp
 $(OBJS)\test_longlongtest.o: ./longlong/longlongtest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_convautotest.o: ./mbconv/convautotest.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_mbconvtest.o: ./mbconv/mbconvtest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
@@ -329,6 +341,9 @@ $(OBJS)\test_strings.o: ./strings/strings.cpp
 $(OBJS)\test_stdstrings.o: ./strings/stdstrings.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_tokenizer.o: ./strings/tokenizer.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_unicode.o: ./strings/unicode.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
@@ -365,11 +380,14 @@ $(OBJS)\test_textstreamtest.o: ./streams/textstreamtest.cpp
 $(OBJS)\test_zlibstream.o: ./streams/zlibstream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_textfiletest.o: ./textfile/textfiletest.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_uris.o: ./uris/uris.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_gui_sample_rc.o: ./../samples/sample.rc
-       windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) --include-dir ./../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_3) --include-dir ./../samples
+       windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) --include-dir $(SETUPHDIR) --include-dir ./../include --include-dir . $(__DLLFLAG_p_3) --include-dir ./../samples
 
 $(OBJS)\test_gui_dummy.o: ./dummy.cpp
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<