Fix horizontal mouse wheel scrolling in wxGTK.

[wxWidgets.git] / tests / makefile.gcc

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index 1778384b8d2faa2fe8574e0eb8dd0a254b32a5bb..9354b5dd2873cfb7e0d723753f6c9d01551ca01d 100644 (file)
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -16,8 +16,9 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = gcc\r
 OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
+LIBDIRNAME = \\r
+       .\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)\r
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \\r
@@ -41,6 +42,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_regconf.o \\r
        $(OBJS)\test_datetimetest.o \\r
        $(OBJS)\test_evthandler.o \\r
+       $(OBJS)\test_evtlooptest.o \\r
        $(OBJS)\test_evtsource.o \\r
        $(OBJS)\test_stopwatch.o \\r
        $(OBJS)\test_timertest.o \\r
@@ -169,6 +171,8 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_radiobuttontest.o \\r
        $(OBJS)\test_gui_rearrangelisttest.o \\r
        $(OBJS)\test_gui_richtextctrltest.o \\r
+       $(OBJS)\test_gui_searchctrltest.o \\r
+       $(OBJS)\test_gui_simplebooktest.o \\r
        $(OBJS)\test_gui_slidertest.o \\r
        $(OBJS)\test_gui_spinctrldbltest.o \\r
        $(OBJS)\test_gui_spinctrltest.o \\r
@@ -182,9 +186,12 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_virtlistctrltest.o \\r
        $(OBJS)\test_gui_webtest.o \\r
        $(OBJS)\test_gui_windowtest.o \\r
+       $(OBJS)\test_gui_dialogtest.o \\r
        $(OBJS)\test_gui_clone.o \\r
+       $(OBJS)\test_gui_evtlooptest.o \\r
        $(OBJS)\test_gui_propagation.o \\r
        $(OBJS)\test_gui_keyboard.o \\r
+       $(OBJS)\test_gui_exec.o \\r
        $(OBJS)\test_gui_fonttest.o \\r
        $(OBJS)\test_gui_image.o \\r
        $(OBJS)\test_gui_rawbmp.o \\r
@@ -214,7 +221,10 @@ ifeq ($(USE_GUI),0)
 PORTNAME = base\r
 endif\r
 ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
+PORTNAME = msw$(TOOLKIT_VERSION)\r
+endif\r
+ifeq ($(OFFICIAL_BUILD),1)\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r
 endif\r
 ifeq ($(BUILD),debug)\r
 WXDEBUGFLAG = d\r
@@ -311,6 +321,11 @@ ifeq ($(MONOLITHIC),0)
 __WXLIB_CORE_p = \\r
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
 endif\r
+ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
+__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
+endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r
@@ -439,7 +454,7 @@ $(OBJS)\test.exe: $(TEST_OBJECTS)
 \r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o\r
-       $(CXX) -o $@ $(TEST_GUI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
+       $(CXX) -o $@ $(TEST_GUI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
 endif\r
 \r
 data: \r
@@ -448,7 +463,7 @@ data:
 \r
 data-images: \r
        if not exist image mkdir image\r
-       for %%f in (horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp) do if not exist image\%%f copy .\image\%%f image\r
+       for %%f in (horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp horse_bicubic_50x50.png horse_bicubic_100x100.png horse_bicubic_150x150.png horse_bicubic_300x300.png horse_bilinear_50x50.png horse_bilinear_100x100.png horse_bilinear_150x150.png horse_bilinear_300x300.png horse_box_average_50x50.png horse_box_average_100x100.png horse_box_average_150x150.png horse_box_average_300x300.png) do if not exist image\%%f copy .\image\%%f image\r
 \r
 fr: \r
        if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr\r
@@ -493,6 +508,9 @@ $(OBJS)\test_datetimetest.o: ./datetime/datetimetest.cpp
 $(OBJS)\test_evthandler.o: ./events/evthandler.cpp\r
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
+$(OBJS)\test_evtlooptest.o: ./events/evtlooptest.cpp\r
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\test_evtsource.o: ./events/evtsource.cpp\r
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -850,6 +868,12 @@ $(OBJS)\test_gui_rearrangelisttest.o: ./controls/rearrangelisttest.cpp
 $(OBJS)\test_gui_richtextctrltest.o: ./controls/richtextctrltest.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r
+$(OBJS)\test_gui_searchctrltest.o: ./controls/searchctrltest.cpp\r
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\test_gui_simplebooktest.o: ./controls/simplebooktest.cpp\r
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\test_gui_slidertest.o: ./controls/slidertest.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -889,15 +913,24 @@ $(OBJS)\test_gui_webtest.o: ./controls/webtest.cpp
 $(OBJS)\test_gui_windowtest.o: ./controls/windowtest.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r
+$(OBJS)\test_gui_dialogtest.o: ./controls/dialogtest.cpp\r
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\test_gui_clone.o: ./events/clone.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r
+$(OBJS)\test_gui_evtlooptest.o: ./events/evtlooptest.cpp\r
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\test_gui_propagation.o: ./events/propagation.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\test_gui_keyboard.o: ./events/keyboard.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r
+$(OBJS)\test_gui_exec.o: ./exec/exec.cpp\r
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\test_gui_fonttest.o: ./font/fonttest.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r