X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea10101a158dd81d66cff6e66e0fb6e4e3612e5d..eb6b14dc71402c42e0474779bfcd6e878383071e:/tests/makefile.vc diff --git a/tests/makefile.vc b/tests/makefile.vc index 9f75605a2e..36c0ecce5c 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -15,20 +15,21 @@ WX_RELEASE_NODOT = 29 COMPILER_PREFIX = vc OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) + $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) LIBDIRNAME = \ - .\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) + .\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ /Fd$(OBJS)\test.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. \ - $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"testprec.h" /Fp"$(OBJS)\testprec_test.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + /D_CRT_SECURE_NO_DEPRECATE=1 /D_CRT_NON_CONFORMING_SWPRINTFS=1 \ + /D_SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\include \ + $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \ + /DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + /Yu"testprec.h" /Fp"$(OBJS)\testprec_test.pch" $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ $(OBJS)\test_dummy.obj \ $(OBJS)\test_test.obj \ @@ -43,6 +44,7 @@ TEST_OBJECTS = \ $(OBJS)\test_regconf.obj \ $(OBJS)\test_datetimetest.obj \ $(OBJS)\test_evthandler.obj \ + $(OBJS)\test_evtlooptest.obj \ $(OBJS)\test_evtsource.obj \ $(OBJS)\test_stopwatch.obj \ $(OBJS)\test_timertest.obj \ @@ -116,13 +118,15 @@ TEST_OBJECTS = \ $(OBJS)\test_xmltest.obj TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_27)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) /Fd$(OBJS)\test_gui.pdb $(____DEBUGRUNTIME) \ - $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. $(__DLLFLAG_p) /I.\..\samples \ - /DNOPCH $(CPPUNIT_CFLAGS) /D_CONSOLE $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - /Yu"testprec.h" /Fp"$(OBJS)\testprec_test_gui.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ + /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + /I$(SETUPHDIR) /I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. \ + $(__DLLFLAG_p) /I.\..\samples /DNOPCH $(CPPUNIT_CFLAGS) /D_CONSOLE \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"testprec.h" \ + /Fp"$(OBJS)\testprec_test_gui.pch" $(CPPFLAGS) $(CXXFLAGS) TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_dummy.obj \ $(OBJS)\test_gui_asserthelper.obj \ @@ -131,7 +135,7 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_rect.obj \ $(OBJS)\test_gui_size.obj \ $(OBJS)\test_gui_point.obj \ - $(OBJS)\test_gui_region.obj \ + $(OBJS)\test_gui_region.obj \ $(OBJS)\test_gui_bitmap.obj \ $(OBJS)\test_gui_colour.obj \ $(OBJS)\test_gui_ellipsization.obj \ @@ -171,6 +175,8 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_radiobuttontest.obj \ $(OBJS)\test_gui_rearrangelisttest.obj \ $(OBJS)\test_gui_richtextctrltest.obj \ + $(OBJS)\test_gui_searchctrltest.obj \ + $(OBJS)\test_gui_simplebooktest.obj \ $(OBJS)\test_gui_slidertest.obj \ $(OBJS)\test_gui_spinctrldbltest.obj \ $(OBJS)\test_gui_spinctrltest.obj \ @@ -184,9 +190,12 @@ 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_evtlooptest.obj \ $(OBJS)\test_gui_propagation.obj \ $(OBJS)\test_gui_keyboard.obj \ + $(OBJS)\test_gui_exec.obj \ $(OBJS)\test_gui_fonttest.obj \ $(OBJS)\test_gui_image.obj \ $(OBJS)\test_gui_rawbmp.obj \ @@ -211,11 +220,32 @@ TEST_GUI_RESOURCES = \ ### Conditionally set variables: ### +!if "$(TARGET_CPU)" == "AMD64" +ARCH_SUFFIX = _x64 +!endif +!if "$(TARGET_CPU)" == "IA64" +ARCH_SUFFIX = _ia64 +!endif +!if "$(TARGET_CPU)" == "X64" +ARCH_SUFFIX = _x64 +!endif +!if "$(TARGET_CPU)" == "amd64" +ARCH_SUFFIX = _x64 +!endif +!if "$(TARGET_CPU)" == "ia64" +ARCH_SUFFIX = _ia64 +!endif +!if "$(TARGET_CPU)" == "x64" +ARCH_SUFFIX = _x64 +!endif !if "$(USE_GUI)" == "0" PORTNAME = base !endif !if "$(USE_GUI)" == "1" -PORTNAME = msw +PORTNAME = msw$(TOOLKIT_VERSION) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" WXDEBUGFLAG = d @@ -229,18 +259,6 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif !if "$(SHARED)" == "1" WXDLLFLAG = dll !endif @@ -256,17 +274,23 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "IA64" LINK_TARGET_CPU = /MACHINE:IA64 !endif +!if "$(TARGET_CPU)" == "X64" +LINK_TARGET_CPU = /MACHINE:X64 +!endif !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif !if "$(TARGET_CPU)" == "ia64" LINK_TARGET_CPU = /MACHINE:IA64 !endif +!if "$(TARGET_CPU)" == "x64" +LINK_TARGET_CPU = /MACHINE:X64 +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif !if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_2 = $(__DEBUGRUNTIME_0) @@ -364,7 +388,7 @@ ____CAIRO_INCLUDEDIR_FILENAMES_3_p = /i $(CAIRO_ROOT)\include\cairo !if "$(SHARED)" == "1" __DLLFLAG_p_3 = /d WXUSINGDLL !endif -!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1" +!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1" __WXLIB_WEBVIEW_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib !endif @@ -392,6 +416,9 @@ __WXLIB_HTML_p = \ __WXLIB_CORE_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" +__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib +!endif !if "$(USE_GUI)" == "1" __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib !endif @@ -581,7 +608,7 @@ $(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS) !if "$(USE_GUI)" == "1" $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\test_gui.pdb" $(__DEBUGINFO_19) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(TEST_GUI_OBJECTS) $(TEST_GUI_RESOURCES) $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib + $(TEST_GUI_OBJECTS) $(TEST_GUI_RESOURCES) $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << !endif @@ -591,7 +618,7 @@ data: data-images: if not exist image mkdir image - for %f in (horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp) do if not exist image\%f copy .\image\%f image + for %f in (horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp horse_bicubic_50x50.png horse_bicubic_100x100.png horse_bicubic_150x150.png horse_bicubic_300x300.png horse_bilinear_50x50.png horse_bilinear_100x100.png horse_bilinear_150x150.png horse_bilinear_300x300.png horse_box_average_50x50.png horse_box_average_100x100.png horse_box_average_150x150.png horse_box_average_300x300.png) do if not exist image\%f copy .\image\%f image fr: if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr @@ -636,6 +663,9 @@ $(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp $(OBJS)\test_evthandler.obj: .\events\evthandler.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\evthandler.cpp +$(OBJS)\test_evtlooptest.obj: .\events\evtlooptest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\evtlooptest.cpp + $(OBJS)\test_evtsource.obj: .\events\evtsource.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\evtsource.cpp @@ -853,7 +883,7 @@ $(OBJS)\test_gui_dummy.obj: .\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) /Yctestprec.h .\dummy.cpp $(OBJS)\test_gui_sample.res: .\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_20_p_1) $(__NO_VC_CRTDBG_p_3) /d __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__NDEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) /i $(SETUPHDIR) /i .\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_3_p) /i . $(__DLLFLAG_p_3) /i .\..\samples /d NOPCH /d _CONSOLE .\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_20_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_3) /d __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__NDEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) /i $(SETUPHDIR) /i .\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_3_p) /i . $(__DLLFLAG_p_3) /i .\..\samples /d NOPCH /d _CONSOLE .\..\samples\sample.rc $(OBJS)\test_gui_asserthelper.obj: .\asserthelper.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\asserthelper.cpp @@ -873,9 +903,9 @@ $(OBJS)\test_gui_size.obj: .\geometry\size.cpp $(OBJS)\test_gui_point.obj: .\geometry\point.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\geometry\point.cpp -$(OBJS)\test_gui_region.obj: .\geometry\region.cpp - $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\geometry\region.cpp - +$(OBJS)\test_gui_region.obj: .\geometry\region.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\geometry\region.cpp + $(OBJS)\test_gui_bitmap.obj: .\graphics\bitmap.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\bitmap.cpp @@ -993,6 +1023,12 @@ $(OBJS)\test_gui_rearrangelisttest.obj: .\controls\rearrangelisttest.cpp $(OBJS)\test_gui_richtextctrltest.obj: .\controls\richtextctrltest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\richtextctrltest.cpp +$(OBJS)\test_gui_searchctrltest.obj: .\controls\searchctrltest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\searchctrltest.cpp + +$(OBJS)\test_gui_simplebooktest.obj: .\controls\simplebooktest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\simplebooktest.cpp + $(OBJS)\test_gui_slidertest.obj: .\controls\slidertest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\slidertest.cpp @@ -1032,15 +1068,24 @@ $(OBJS)\test_gui_webtest.obj: .\controls\webtest.cpp $(OBJS)\test_gui_windowtest.obj: .\controls\windowtest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\windowtest.cpp +$(OBJS)\test_gui_dialogtest.obj: .\controls\dialogtest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\dialogtest.cpp + $(OBJS)\test_gui_clone.obj: .\events\clone.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\clone.cpp +$(OBJS)\test_gui_evtlooptest.obj: .\events\evtlooptest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\evtlooptest.cpp + $(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp $(OBJS)\test_gui_keyboard.obj: .\events\keyboard.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\keyboard.cpp +$(OBJS)\test_gui_exec.obj: .\exec\exec.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\exec\exec.cpp + $(OBJS)\test_gui_fonttest.obj: .\font\fonttest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\font\fonttest.cpp