X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14b682f7c36ecf660c2f0bd5c791b8d36d9775f8..f321d0bc0caf4d78ccc5426e926fc25c46297439:/tests/makefile.wat?ds=sidebyside diff --git a/tests/makefile.wat b/tests/makefile.wat index 7eaa190e05..6cd16d2fcb 100644 --- a/tests/makefile.wat +++ b/tests/makefile.wat @@ -38,10 +38,10 @@ PORTNAME = base !ifeq USE_GUI 1 PORTNAME = msw !endif -COMPILER_VERSION = -!ifeq OFFICIAL_BUILD 1 -COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD -!endif +COMPILER_VERSION = +!ifeq OFFICIAL_BUILD 1 +COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD +!endif WXDEBUGFLAG = !ifeq BUILD debug WXDEBUGFLAG = d @@ -273,9 +273,9 @@ __DLLFLAG_p = -dWXUSINGDLL WX_RELEASE_NODOT = 29 COMPILER_PREFIX = wat OBJS = & - $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = & - .\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) + $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = & + .\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & @@ -440,6 +440,7 @@ TEST_GUI_OBJECTS = & $(OBJS)\test_gui_virtlistctrltest.obj & $(OBJS)\test_gui_webtest.obj & $(OBJS)\test_gui_windowtest.obj & + $(OBJS)\test_gui_dialogtest.obj & $(OBJS)\test_gui_clone.obj & $(OBJS)\test_gui_propagation.obj & $(OBJS)\test_gui_keyboard.obj & @@ -954,6 +955,9 @@ $(OBJS)\test_gui_webtest.obj : .AUTODEPEND .\controls\webtest.cpp $(OBJS)\test_gui_windowtest.obj : .AUTODEPEND .\controls\windowtest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< +$(OBJS)\test_gui_dialogtest.obj : .AUTODEPEND .\controls\dialogtest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + $(OBJS)\test_gui_clone.obj : .AUTODEPEND .\events\clone.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<