functions not taking argument must be declared as (void) in C, not ()

[wxWidgets.git] / tests / makefile.wat

diff --git a/tests/makefile.wat b/tests/makefile.wat
index ea59e205db40e2803e69eb11b4c6b152d5bea87c..295d7b66dfb5e5bb95a1044a6987f559aa486ec0 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -219,9 +219,10 @@ __GDIPLUS_LIB_p = gdiplus.lib
 ### Variables: ###
 
 WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
 OBJS = &
-       wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
@@ -238,8 +239,9 @@ TEST_OBJECTS =  &
        $(OBJS)\test_ziptest.obj &
        $(OBJS)\test_tartest.obj &
        $(OBJS)\test_arrays.obj &
+       $(OBJS)\test_base64.obj &
+       $(OBJS)\test_fileconf.obj &
        $(OBJS)\test_datetimetest.obj &
-       $(OBJS)\test_fileconftest.obj &
        $(OBJS)\test_filekind.obj &
        $(OBJS)\test_filenametest.obj &
        $(OBJS)\test_filesystest.obj &
@@ -274,7 +276,9 @@ TEST_OBJECTS =  &
        $(OBJS)\test_textstreamtest.obj &
        $(OBJS)\test_zlibstream.obj &
        $(OBJS)\test_textfiletest.obj &
-       $(OBJS)\test_uris.obj
+       $(OBJS)\test_atomic.obj &
+       $(OBJS)\test_uris.obj &
+       $(OBJS)\test_vectors.obj
 TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
@@ -287,7 +291,8 @@ TEST_GUI_OBJECTS =  &
        $(OBJS)\test_gui_test.obj &
        $(OBJS)\test_gui_rect.obj &
        $(OBJS)\test_gui_size.obj &
-       $(OBJS)\test_gui_point.obj
+       $(OBJS)\test_gui_point.obj &
+       $(OBJS)\test_gui_config.obj
 PRINTFBENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
@@ -382,10 +387,13 @@ $(OBJS)\test_tartest.obj :  .AUTODEPEND .\archive\tartest.cpp
 $(OBJS)\test_arrays.obj :  .AUTODEPEND .\arrays\arrays.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
-$(OBJS)\test_datetimetest.obj :  .AUTODEPEND .\datetime\datetimetest.cpp
+$(OBJS)\test_base64.obj :  .AUTODEPEND .\base64\base64.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
-$(OBJS)\test_fileconftest.obj :  .AUTODEPEND .\fileconf\fileconftest.cpp
+$(OBJS)\test_fileconf.obj :  .AUTODEPEND .\config\fileconf.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_datetimetest.obj :  .AUTODEPEND .\datetime\datetimetest.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_filekind.obj :  .AUTODEPEND .\filekind\filekind.cpp
@@ -490,9 +498,15 @@ $(OBJS)\test_zlibstream.obj :  .AUTODEPEND .\streams\zlibstream.cpp
 $(OBJS)\test_textfiletest.obj :  .AUTODEPEND .\textfile\textfiletest.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_atomic.obj :  .AUTODEPEND .\thread\atomic.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_uris.obj :  .AUTODEPEND .\uris\uris.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_vectors.obj :  .AUTODEPEND .\vectors\vectors.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_gui_sample.res :  .AUTODEPEND .\..\samples\sample.rc
        wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include -i=. $(__DLLFLAG_p) -i=.\..\samples -dNOPCH $<
 
@@ -511,6 +525,9 @@ $(OBJS)\test_gui_size.obj :  .AUTODEPEND .\geometry\size.cpp
 $(OBJS)\test_gui_point.obj :  .AUTODEPEND .\geometry\point.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 
+$(OBJS)\test_gui_config.obj :  .AUTODEPEND .\config\config.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
 $(OBJS)\printfbench_dummy.obj :  .AUTODEPEND .\dummy.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(PRINTFBENCH_CXXFLAGS) $<