Fixes to allow compilation with no wchar_t (djgpp probably has a real wchar_t

[wxWidgets.git] / tests / makefile.gcc

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index 7456ffc3e220e5f1884d793e1b2581af33bd1b61..e1d236fc7413261f5c87a7b8063983b7085977a1 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.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)

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


@@ -12,39 +12,66 @@ include ../build/msw/config.gcc
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-WX_RELEASE_NODOT = 25
+WX_RELEASE_NODOT = 26

 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

+LIBDIRNAME = .\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)

 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

-TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \
-       -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       -I.\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) \
-       $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS)
+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) \
+       $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)

 TEST_OBJECTS =  \
 TEST_OBJECTS =  \

+       $(OBJS)\test_dummy.o \

        $(OBJS)\test_test.o \
        $(OBJS)\test_test.o \

-       $(OBJS)\test_main.o \
-       $(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_archivetest.o \
+       $(OBJS)\test_ziptest.o \

        $(OBJS)\test_arrays.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_fontmaptest.o \
+       $(OBJS)\test_formatconvertertest.o \

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

-       $(OBJS)\test_longlong.o \
+       $(OBJS)\test_lists.o \
+       $(OBJS)\test_longlongtest.o \
+       $(OBJS)\test_mbconvtest.o \
+       $(OBJS)\test_regextest.o \
+       $(OBJS)\test_wxregextest.o \

        $(OBJS)\test_strings.o \
        $(OBJS)\test_stdstrings.o \
        $(OBJS)\test_unicode.o \
        $(OBJS)\test_crt.o \
        $(OBJS)\test_bstream.o \
        $(OBJS)\test_strings.o \
        $(OBJS)\test_stdstrings.o \
        $(OBJS)\test_unicode.o \
        $(OBJS)\test_crt.o \
        $(OBJS)\test_bstream.o \

+       $(OBJS)\test_datastreamtest.o \

        $(OBJS)\test_ffilestream.o \
        $(OBJS)\test_filestream.o \
        $(OBJS)\test_ffilestream.o \
        $(OBJS)\test_filestream.o \

+       $(OBJS)\test_largefile.o \

        $(OBJS)\test_memstream.o \
        $(OBJS)\test_sstream.o \
        $(OBJS)\test_memstream.o \
        $(OBJS)\test_sstream.o \

+       $(OBJS)\test_tempfile.o \
+       $(OBJS)\test_textstreamtest.o \

        $(OBJS)\test_zlibstream.o \
        $(OBJS)\test_zlibstream.o \

-       $(OBJS)\test_fontmap.o \
-       $(OBJS)\test_datetime.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)
+TEST_GUI_OBJECTS =  \
+       $(OBJS)\test_gui_sample_rc.o \
+       $(OBJS)\test_gui_dummy.o \
+       $(OBJS)\test_gui_test.o \
+       $(OBJS)\test_gui_rect.o \
+       $(OBJS)\test_gui_size.o \
+       $(OBJS)\test_gui_point.o

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 


@@ -74,23 +101,72 @@ endif
 ifeq ($(SHARED),1)
 WXDLLFLAG = dll
 endif
 ifeq ($(SHARED),1)
 WXDLLFLAG = dll
 endif

+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_NET_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
+endif
+ifeq ($(USE_GUI),1)
+__test_gui___depname = $(OBJS)\test_gui.exe
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_3 = --define __WXUNIVERSAL__
+endif

 ifeq ($(BUILD),debug)
 ifeq ($(BUILD),debug)

-__OPTIMIZEFLAG_2 = -O0
+ifeq ($(DEBUG_FLAG),default)
+__DEBUG_DEFINE_p_3 = --define __WXDEBUG__

 endif
 endif

-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(DEBUG_FLAG),1)
+__DEBUG_DEFINE_p_3 = --define __WXDEBUG__

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

-__EXCEPTIONSFLAG_4 = -fno-rtti
+__EXCEPTIONS_DEFINE_p_3 = --define wxNO_EXCEPTIONS

 endif
 endif

-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_4 = 
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_3 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_3 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_3 = --define _UNICODE
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_3 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG = -O2
+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_5 = -fno-exceptions
+__EXCEPTIONSFLAG = -fno-exceptions

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

-__EXCEPTIONSFLAG_5 = 
+__EXCEPTIONSFLAG = 

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


@@ -103,6 +179,15 @@ endif
 ifeq ($(DEBUG_FLAG),1)
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
 ifeq ($(DEBUG_FLAG),1)
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif

+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif

 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -D_UNICODE
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -D_UNICODE
 endif


@@ -129,12 +214,6 @@ endif
 ifeq ($(MSLU),1)
 __UNICOWS_LIB_p = -lunicows
 endif
 ifeq ($(MSLU),1)
 __UNICOWS_LIB_p = -lunicows
 endif

-ifeq ($(SHARED),0)
-LIBDIRNAME = .\..\lib\gcc_lib$(CFG)
-endif
-ifeq ($(SHARED),1)
-LIBDIRNAME = .\..\lib\gcc_dll$(CFG)
-endif

 ifeq ($(BUILD),debug)
 ifeq ($(DEBUG_INFO),default)
 __DEBUGINFO = -g
 ifeq ($(BUILD),debug)
 ifeq ($(DEBUG_INFO),default)
 __DEBUGINFO = -g


@@ -151,6 +230,12 @@ endif
 ifeq ($(DEBUG_INFO),1)
 __DEBUGINFO = -g
 endif
 ifeq ($(DEBUG_INFO),1)
 __DEBUGINFO = -g
 endif

+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif

 
 
 all: $(OBJS)
 
 
 all: $(OBJS)


@@ -159,50 +244,77 @@ $(OBJS):
 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: $(OBJS)\test.exe data
+all: $(OBJS)\test.exe $(__test_gui___depname) data

 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\test.exe del $(OBJS)\test.exe

+       -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe

 
 $(OBJS)\test.exe: $(TEST_OBJECTS)
 
 $(OBJS)\test.exe: $(TEST_OBJECTS)

-       $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME)  $(CPPUNIT_LIBS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__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
+       $(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: 
        if not exist $(OBJS) mkdir $(OBJS)
        for %%f in (testdata.fc) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
        for %%f in (testdata.fc) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 

+$(OBJS)\test_dummy.o: ./dummy.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+

 $(OBJS)\test_test.o: ./test.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_test.o: ./test.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 

-$(OBJS)\test_main.o: ./mbconv/main.cpp
+$(OBJS)\test_archivetest.o: ./archive/archivetest.cpp

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

-$(OBJS)\test_formatconverter.o: ./formatconverter/formatconverter.cpp
+$(OBJS)\test_ziptest.o: ./archive/ziptest.cpp

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

-$(OBJS)\test_regex.o: ./regex/regex.cpp
+$(OBJS)\test_arrays.o: ./arrays/arrays.cpp

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

-$(OBJS)\test_wxregex.o: ./regex/wxregex.cpp
+$(OBJS)\test_datetimetest.o: ./datetime/datetimetest.cpp

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

-$(OBJS)\test_fileconf.o: ./fileconf/fileconf.cpp
+$(OBJS)\test_fileconftest.o: ./fileconf/fileconftest.cpp

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

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

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

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

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

-$(OBJS)\test_arrays.o: ./arrays/arrays.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_formatconvertertest.o: ./formatconverter/formatconvertertest.cpp

        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_hashes.o: ./hashes/hashes.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_hashes.o: ./hashes/hashes.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 

-$(OBJS)\test_longlong.o: ./longlong/longlong.cpp
+$(OBJS)\test_lists.o: ./lists/lists.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_longlongtest.o: ./longlong/longlongtest.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_mbconvtest.o: ./mbconv/mbconvtest.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_regextest.o: ./regex/regextest.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_wxregextest.o: ./regex/wxregextest.cpp

        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_strings.o: ./strings/strings.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_strings.o: ./strings/strings.cpp


@@ -220,25 +332,54 @@ $(OBJS)\test_crt.o: ./strings/crt.cpp
 $(OBJS)\test_bstream.o: ./streams/bstream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_bstream.o: ./streams/bstream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 

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

 $(OBJS)\test_ffilestream.o: ./streams/ffilestream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_filestream.o: ./streams/filestream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_ffilestream.o: ./streams/ffilestream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_filestream.o: ./streams/filestream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 

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

 $(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_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
+$(OBJS)\test_tempfile.o: ./streams/tempfile.cpp

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

-$(OBJS)\test_fontmap.o: ./fontmap/fontmap.cpp
+$(OBJS)\test_textstreamtest.o: ./streams/textstreamtest.cpp

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

-$(OBJS)\test_datetime.o: ./datetime/datetime.cpp
+$(OBJS)\test_zlibstream.o: ./streams/zlibstream.cpp

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

+$(OBJS)\test_uris.o: ./uris/uris.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(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
+
+$(OBJS)\test_gui_dummy.o: ./dummy.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $<
+
+$(OBJS)\test_gui_test.o: ./test.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $<
+
+$(OBJS)\test_gui_rect.o: ./geometry/rect.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $<
+
+$(OBJS)\test_gui_size.o: ./geometry/size.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $<
+
+$(OBJS)\test_gui_point.o: ./geometry/point.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $<
+

 .PHONY: all clean data
 .PHONY: all clean data

+
+