Merged GSOC Ribbon work from SOC2009_RIBBON branch into trunk.

[wxWidgets.git] / tests / makefile.vc

diff --git a/tests/makefile.vc b/tests/makefile.vc
index dfa04f336716889f8a068211abde1cf7ee7cb11d..92c2b269a25b5db0822d17910aee54f474d12f93 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -42,6 +42,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_evthandler.obj \
        $(OBJS)\test_timertest.obj \
        $(OBJS)\test_exec.obj \
+       $(OBJS)\test_filetest.obj \
        $(OBJS)\test_filekind.obj \
        $(OBJS)\test_filenametest.obj \
        $(OBJS)\test_filesystest.obj \
@@ -140,10 +141,10 @@ PORTNAME = base
 !if "$(USE_GUI)" == "1"
 PORTNAME = msw
 !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
 WXDEBUGFLAG = d
 !endif
-!if "$(DEBUG_FLAG)" == "1"
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
 WXDEBUGFLAG = d
 !endif
 !if "$(UNICODE)" == "1"
@@ -227,11 +228,8 @@ __NO_VC_CRTDBG_p_3 = /d __NO_VC_CRTDBG__
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p_3 = /d __WXUNIVERSAL__
 !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_3 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_3 = /d __WXDEBUG__
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_3 = /d wxDEBUG_LEVEL=0
 !endif
 !if "$(USE_EXCEPTIONS)" == "0"
 __EXCEPTIONS_DEFINE_p_3 = /d wxNO_EXCEPTIONS
@@ -367,11 +365,8 @@ __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
 !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
 !endif
 !if "$(USE_EXCEPTIONS)" == "0"
 __EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
@@ -499,6 +494,9 @@ $(OBJS)\test_timertest.obj: .\events\timertest.cpp
 $(OBJS)\test_exec.obj: .\exec\exec.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\exec\exec.cpp
 
+$(OBJS)\test_filetest.obj: .\file\filetest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\file\filetest.cpp
+
 $(OBJS)\test_filekind.obj: .\filekind\filekind.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\filekind\filekind.cpp