Added SetScrollLinesX, SetScrollLinesY so apps can work around scrollbar

[wxWidgets.git] / tests / makefile.gcc

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index c0335b58bf9e2aef1eabaf2e3b4f210f4d0bb876..7456ffc3e220e5f1884d793e1b2581af33bd1b61 100644 (file)
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -12,6 +12,7 @@ include ../build/msw/config.gcc
 
 ### Variables: ###
 
+WX_RELEASE_NODOT = 25
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = \
@@ -26,6 +27,8 @@ TEST_OBJECTS =  \
        $(OBJS)\test_formatconverter.o \
        $(OBJS)\test_regex.o \
        $(OBJS)\test_wxregex.o \
+       $(OBJS)\test_fileconf.o \
+       $(OBJS)\test_filename.o \
        $(OBJS)\test_filesys.o \
        $(OBJS)\test_arrays.o \
        $(OBJS)\test_hashes.o \
@@ -33,11 +36,15 @@ TEST_OBJECTS =  \
        $(OBJS)\test_strings.o \
        $(OBJS)\test_stdstrings.o \
        $(OBJS)\test_unicode.o \
+       $(OBJS)\test_crt.o \
        $(OBJS)\test_bstream.o \
        $(OBJS)\test_ffilestream.o \
        $(OBJS)\test_filestream.o \
        $(OBJS)\test_memstream.o \
-       $(OBJS)\test_zlibstream.o
+       $(OBJS)\test_sstream.o \
+       $(OBJS)\test_zlibstream.o \
+       $(OBJS)\test_fontmap.o \
+       $(OBJS)\test_datetime.o
 
 ### Conditionally set variables: ###
 
@@ -103,11 +110,12 @@ ifeq ($(SHARED),1)
 __DLLFLAG_p = -DWXUSINGDLL
 endif
 ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
 endif
 ifeq ($(MONOLITHIC),1)
 __WXLIB_MONO_p = \
-       -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
 endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
@@ -179,6 +187,12 @@ $(OBJS)\test_regex.o: ./regex/regex.cpp
 $(OBJS)\test_wxregex.o: ./regex/wxregex.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_fileconf.o: ./fileconf/fileconf.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_filename.o: ./filename/filename.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_filesys.o: ./filesys/filesys.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
@@ -200,6 +214,9 @@ $(OBJS)\test_stdstrings.o: ./strings/stdstrings.cpp
 $(OBJS)\test_unicode.o: ./strings/unicode.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_crt.o: ./strings/crt.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_bstream.o: ./streams/bstream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
@@ -212,7 +229,16 @@ $(OBJS)\test_filestream.o: ./streams/filestream.cpp
 $(OBJS)\test_memstream.o: ./streams/memstream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_sstream.o: ./streams/sstream.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_zlibstream.o: ./streams/zlibstream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_fontmap.o: ./fontmap/fontmap.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_datetime.o: ./datetime/datetime.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
 .PHONY: all clean data