don't set virtual size of the window to (0, 0) if scrollbars are removed from it

[wxWidgets.git] / tests / makefile.gcc

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index 6ae8c2a5248f05376a17a70872d35f66c1be7772..e03845161f68b1ac588840dce7e6c246d3632e64 100644 (file)
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.7 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -21,8 +21,8 @@ SETUPHDIR = \
 TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
        -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
        -I.\..\include -I$(SETUPHDIR) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
 TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
        -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
        -I.\..\include -I$(SETUPHDIR) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \

-       $(CPPUNIT_CFLAGS) $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \
-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+       $(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \
+       $(CPPFLAGS) $(CXXFLAGS)

 TEST_OBJECTS =  \
        $(OBJS)\test_dummy.o \
        $(OBJS)\test_test.o \
 TEST_OBJECTS =  \
        $(OBJS)\test_dummy.o \
        $(OBJS)\test_test.o \


@@ -31,9 +31,9 @@ TEST_OBJECTS =  \
        $(OBJS)\test_arrays.o \
        $(OBJS)\test_datetimetest.o \
        $(OBJS)\test_fileconftest.o \
        $(OBJS)\test_arrays.o \
        $(OBJS)\test_datetimetest.o \
        $(OBJS)\test_fileconftest.o \

+       $(OBJS)\test_filekind.o \

        $(OBJS)\test_filenametest.o \
        $(OBJS)\test_filesystest.o \
        $(OBJS)\test_filenametest.o \
        $(OBJS)\test_filesystest.o \

-       $(OBJS)\test_filetype.o \

        $(OBJS)\test_fontmaptest.o \
        $(OBJS)\test_formatconvertertest.o \
        $(OBJS)\test_hashes.o \
        $(OBJS)\test_fontmaptest.o \
        $(OBJS)\test_formatconvertertest.o \
        $(OBJS)\test_hashes.o \


@@ -53,14 +53,15 @@ TEST_OBJECTS =  \
        $(OBJS)\test_largefile.o \
        $(OBJS)\test_memstream.o \
        $(OBJS)\test_sstream.o \
        $(OBJS)\test_largefile.o \
        $(OBJS)\test_memstream.o \
        $(OBJS)\test_sstream.o \

+       $(OBJS)\test_tempfile.o \

        $(OBJS)\test_textstreamtest.o \
        $(OBJS)\test_zlibstream.o \
        $(OBJS)\test_uris.o
 TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I.\..\include -I$(SETUPHDIR) -W -Wall -I. \
        $(OBJS)\test_textstreamtest.o \
        $(OBJS)\test_zlibstream.o \
        $(OBJS)\test_uris.o
 TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I.\..\include -I$(SETUPHDIR) -W -Wall -I. \

-       $(__DLLFLAG_p) -I.\..\samples -DNOPCH $(CPPUNIT_CFLAGS) $(__EXCEPTIONSFLAG) \
-       $(__EXCEPTIONSFLAG_0) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+       $(__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 \
 TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_sample_rc.o \
        $(OBJS)\test_gui_dummy.o \


@@ -143,17 +144,23 @@ endif
 ifeq ($(BUILD),release)
 __OPTIMIZEFLAG = -O2
 endif
 ifeq ($(BUILD),release)
 __OPTIMIZEFLAG = -O2
 endif

-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG = -fno-rtti
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 

 endif
 endif

-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG = 
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG = 

 endif
 ifeq ($(USE_EXCEPTIONS),0)
 endif
 ifeq ($(USE_EXCEPTIONS),0)

-__EXCEPTIONSFLAG_0 = -fno-exceptions
+__EXCEPTIONSFLAG = -fno-exceptions

 endif
 ifeq ($(USE_EXCEPTIONS),1)
 endif
 ifeq ($(USE_EXCEPTIONS),1)

-__EXCEPTIONSFLAG_0 = 
+__EXCEPTIONSFLAG = 

 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__


@@ -224,11 +231,11 @@ clean:
        -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
 
 $(OBJS)\test.exe: $(TEST_OBJECTS)
        -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
 
 $(OBJS)\test.exe: $(TEST_OBJECTS)

-       $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME)  $(CPPUNIT_LIBS)  $(__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) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
+       $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(CPPUNIT_LIBS)  $(__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) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32

 
 ifeq ($(USE_GUI),1)
 $(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o
 
 ifeq ($(USE_GUI),1)
 $(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o

-       $(CXX) -o $@ $(TEST_GUI_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) $(CPPUNIT_LIBS)   $(__WXLIB_CORE_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) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
+       $(CXX) -o $@ $(TEST_GUI_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS)   $(__WXLIB_CORE_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) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32

 endif
 
 data: 
 endif
 
 data: 


@@ -256,13 +263,13 @@ $(OBJS)\test_datetimetest.o: ./datetime/datetimetest.cpp
 $(OBJS)\test_fileconftest.o: ./fileconf/fileconftest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_fileconftest.o: ./fileconf/fileconftest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 

-$(OBJS)\test_filenametest.o: ./filename/filenametest.cpp
+$(OBJS)\test_filekind.o: ./filekind/filekind.cpp

        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 

-$(OBJS)\test_filesystest.o: ./filesys/filesystest.cpp
+$(OBJS)\test_filenametest.o: ./filename/filenametest.cpp

        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 

-$(OBJS)\test_filetype.o: ./filetype/filetype.cpp
+$(OBJS)\test_filesystest.o: ./filesys/filesystest.cpp

        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_fontmaptest.o: ./fontmap/fontmaptest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_fontmaptest.o: ./fontmap/fontmaptest.cpp


@@ -322,6 +329,9 @@ $(OBJS)\test_memstream.o: ./streams/memstream.cpp
 $(OBJS)\test_sstream.o: ./streams/sstream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_sstream.o: ./streams/sstream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 

+$(OBJS)\test_tempfile.o: ./streams/tempfile.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+

 $(OBJS)\test_textstreamtest.o: ./streams/textstreamtest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_textstreamtest.o: ./streams/textstreamtest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<