[Git][wxwidgets/wxwidgets][master] 6 commits: Update MSVS build files for vs14x only builds.

1 view
Skip to first unread message

Vadim Zeitlin (@_VZ_)

unread,
May 20, 2025, 9:39:36 AMMay 20
to wx-commi...@googlegroups.com

Vadim Zeitlin pushed to branch master at wxWidgets / wxWidgets

Commits:

  • aa397ee8
    by dos at 2025-05-19T15:30:43-03:00 
    Update MSVS build files for vs14x only builds.
  • ade4adcd
    by dos at 2025-05-20T09:38:35-03:00 
    Add SDK version to build, correct fciv path.
  • 5621b2bc
    by ChipZhang at 2025-05-20T15:06:27+02:00 
    Fix compilation of widgets sample with wxUSE_TREEBOOK==0

Replace the remaining call to SetImageList() with SetImages() too.

This should have been part of e0ed66b8d3 (Use wxBitmapBundle for widgets
sample icons, 2025-03-30), see #25282.

Closes #25428.

Closes #25429.
  • a51ec005
    by Vadim Zeitlin at 2025-05-20T15:06:27+02:00 
    Fix compilation of wx/longlong.h included as first header

Forward declare wxTextStream classes used in it.

Closes #25430.
  • 5e03901f
    by Vadim Zeitlin at 2025-05-20T15:06:56+02:00 
    Merge branch 'buildtools' of github.com:doscott/wxWidgets

Update MSVS build files for vc14x only builds as we don't support any
compilers older than MSVS 2015 in master.

See #25424.
  • 098f2140
    by Vadim Zeitlin at 2025-05-20T15:14:55+02:00 
    Ensure that we include built-in 3rd party libraries headers

Use template_append when using 3rd party library template to ensure that
the include directories defined in the <lib> using this template appear
first in the compiler command line, so that the correct headers get
included even when the system libraries are also available.

Note that this required refactoring the old 3rdparty_lib template into
the base 3rdparty_lib_base and new 3rdparty_lib_u, as appending the old
template to wxregex lib overwrote libname defined in the latter
otherwise.

Closes #25350.

See #25352.

18 changed files:

Changes:

  • Makefile.in
    ... ... @@ -87,10 +87,9 @@ WX_RELEASE_NODOT = 33
    87 87 
     WX_VERSION = $(WX_RELEASE).0
    88 88 
     WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
    89 89 
     LIBDIRNAME = $(wx_top_builddir)/lib
    90 
    -WXREGEX_CFLAGS = $(WX_CPPFLAGS) -DNDEBUG \
    91 
    -	-I$(wx_top_builddir)/3rdparty/pcre/src -D__WX__ -DHAVE_CONFIG_H \
    92 
    -	-DPCRE2_CODE_UNIT_WIDTH=$(wxPCRE2_CODE_UNIT_WIDTH) $(WX_CFLAGS) \
    93 
    -	$(____SHARED) $(CPPFLAGS) $(CFLAGS)
    90 
    +WXREGEX_CFLAGS = -I$(wx_top_builddir)/3rdparty/pcre/src -D__WX__ \
    91 
    +	-DHAVE_CONFIG_H -DPCRE2_CODE_UNIT_WIDTH=$(wxPCRE2_CODE_UNIT_WIDTH) \
    92 
    +	$(WX_CPPFLAGS) -DNDEBUG $(WX_CFLAGS) $(____SHARED) $(CPPFLAGS) $(CFLAGS)
    94 93 
     WXREGEX_OBJECTS =  \
    95 94 
     	wxregex_pcre2_auto_possess.o \
    96 95 
     	wxregex_pcre2_chkdint.o \
    ... ... @@ -139,7 +138,7 @@ WXZLIB_OBJECTS = \
    139 138 
     	wxzlib_trees.o \
    140 139 
     	wxzlib_uncompr.o \
    141 140 
     	wxzlib_zutil.o
    142 
    -WXPNG_CFLAGS = $(WX_CPPFLAGS) -DNDEBUG $(__INC_ZLIB_p) -DPNG_INTEL_SSE \
    141 
    +WXPNG_CFLAGS = $(__INC_ZLIB_p) -DPNG_INTEL_SSE $(WX_CPPFLAGS) -DNDEBUG \
    143 142 
     	$(WX_CFLAGS) $(____SHARED) $(CPPFLAGS) $(CFLAGS)
    144 143 
     WXPNG_OBJECTS =  \
    145 144 
     	wxpng_png.o \
    ... ... @@ -337,9 +336,9 @@ WXJPEG_OBJECTS = \
    337 336 
     	wxjpeg_jquant1.o \
    338 337 
     	wxjpeg_jquant2.o \
    339 338 
     	wxjpeg_jutils.o
    340 
    -WXTIFF_CFLAGS = $(WX_CPPFLAGS) -DNDEBUG $(__INC_ZLIB_p) $(__INC_JPEG_p) \
    341 
    -	$(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(WX_CFLAGS) $(____SHARED) $(CPPFLAGS) \
    342 
    -	$(CFLAGS)
    339 
    +WXTIFF_CFLAGS = $(__INC_ZLIB_p) $(__INC_JPEG_p) $(__INC_TIFF_BUILD_p) \
    340 
    +	$(__INC_TIFF_p) $(WX_CPPFLAGS) -DNDEBUG $(WX_CFLAGS) $(____SHARED) \
    341 
    +	$(CPPFLAGS) $(CFLAGS)
    343 342 
     WXTIFF_OBJECTS =  \
    344 343 
     	$(__TIFF_PLATFORM_SRC_OBJECTS) \
    345 344 
     	wxtiff_tif_aux.o \
    ... ... @@ -383,17 +382,16 @@ WXTIFF_OBJECTS = \
    383 382 
     	wxtiff_tif_write.o \
    384 383 
     	wxtiff_tif_zip.o \
    385 384 
     	wxtiff_tif_zstd.o
    386 
    -WXEXPAT_CFLAGS = $(WX_CPPFLAGS) -DNDEBUG -I./src/expat/expat \
    387 
    -	-DHAVE_EXPAT_CONFIG_H $(WX_CFLAGS) $(____SHARED) $(wxCFLAGS_C99) $(CPPFLAGS) \
    388 
    -	$(CFLAGS)
    385 
    +WXEXPAT_CFLAGS = -I./src/expat/expat -DHAVE_EXPAT_CONFIG_H $(WX_CPPFLAGS) \
    386 
    +	-DNDEBUG $(wxCFLAGS_C99) $(WX_CFLAGS) $(____SHARED) $(CPPFLAGS) $(CFLAGS)
    389 387 
     WXEXPAT_OBJECTS =  \
    390 388 
     	wxexpat_xmlparse.o \
    391 389 
     	wxexpat_xmlrole.o \
    392 390 
     	wxexpat_xmltok.o
    393 
    -WXSCINTILLA_CXXFLAGS = $(WX_CPPFLAGS) -DNDEBUG \
    391 
    +WXSCINTILLA_CXXFLAGS = $(__wx) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
    392 
    +	$(__DEBUG_DEFINE_p) $(WX_CPPFLAGS) -DNDEBUG \
    394 393 
     	-I$(top_srcdir)/src/stc/scintilla/include \
    395 
    -	-I$(top_srcdir)/src/stc/scintilla/src -D__WX__ $(__wx) -D__WX$(TOOLKIT)__ \
    396 
    -	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(WX_CXXFLAGS) $(____SHARED) \
    394 
    +	-I$(top_srcdir)/src/stc/scintilla/src -D__WX__ $(WX_CXXFLAGS) $(____SHARED) \
    397 395 
     	$(CPPFLAGS) $(CXXFLAGS)
    398 396 
     WXSCINTILLA_OBJECTS =  \
    399 397 
     	wxscintilla_AutoComplete.o \
    ... ... @@ -426,14 +424,14 @@ WXSCINTILLA_OBJECTS = \
    426 424 
     	wxscintilla_UniqueString.o \
    427 425 
     	wxscintilla_ViewStyle.o \
    428 426 
     	wxscintilla_XPM.o
    429 
    -WXLEXILLA_CXXFLAGS = $(WX_CPPFLAGS) -DNDEBUG \
    427 
    +WXLEXILLA_CXXFLAGS = $(__wx) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
    428 
    +	$(__DEBUG_DEFINE_p) $(WX_CPPFLAGS) -DNDEBUG \
    430 429 
     	-I$(top_srcdir)/src/stc/lexilla/access \
    431 430 
     	-I$(top_srcdir)/src/stc/lexilla/include \
    432 431 
     	-I$(top_srcdir)/src/stc/lexilla/lexlib \
    433 432 
     	-I$(top_srcdir)/src/stc/lexilla/include \
    434 433 
     	-I$(top_srcdir)/src/stc/scintilla/include \
    435 
    -	-I$(top_srcdir)/src/stc/scintilla/src $(__wx) -D__WX$(TOOLKIT)__ \
    436 
    -	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(WX_CXXFLAGS) $(____SHARED) \
    434 
    +	-I$(top_srcdir)/src/stc/scintilla/src $(WX_CXXFLAGS) $(____SHARED) \
    437 435 
     	$(CPPFLAGS) $(CXXFLAGS)
    438 436 
     WXLEXILLA_OBJECTS =  \
    439 437 
     	wxlexilla_LexillaAccess.o \
    ... ... @@ -2489,13 +2487,13 @@ COND_USE_GUI_1_wxUSE_LIBJPEG_builtin___wxjpeg___depname = \
    2489 2487 
     COND_USE_GUI_1_wxUSE_LIBTIFF_builtin___wxtiff___depname = \
    2490 2488 
     	$(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
    2491 2489 
     @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__wxtiff___depname = $(COND_USE_GUI_1_wxUSE_LIBTIFF_builtin___wxtiff___depname)
    2490 
    +@COND_PLATFORM_MACOSX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
    2491 
    +@COND_PLATFORM_UNIX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
    2492 
    +@COND_PLATFORM_WIN32_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_win32.o
    2492 2493 
     @COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@__install_wxtiff___depname \
    2493 2494 
     @COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= install_wxtiff
    2494 2495 
     @COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@__uninstall_wxtiff___depname \
    2495 2496 
     @COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= uninstall_wxtiff
    2496 
    -@COND_PLATFORM_MACOSX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
    2497 
    -@COND_PLATFORM_UNIX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
    2498 
    -@COND_PLATFORM_WIN32_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_win32.o
    2499 2497 
     COND_wxUSE_EXPAT_builtin___wxexpat___depname = \
    2500 2498 
     	$(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
    2501 2499 
     @COND_wxUSE_EXPAT_builtin@__wxexpat___depname = $(COND_wxUSE_EXPAT_builtin___wxexpat___depname)
    ... ... @@ -12379,9 +12377,9 @@ COND_USE_WEBVIEW_WEBKIT2_1___webkit2_ext___depname = \
    12379 12377 
     @COND_USE_XML_1@__clean_wxrc___depname = clean-wxrc
    12380 12378 
     @COND_USE_XML_1@__install_wxrc___depname = install-wxrc
    12381 12379 
     @COND_TOOLKIT_MSW@RCDEFS_H = msw/rcdefs.h
    12380 
    +@COND_MONOLITHIC_0_SHARED_1@__wx = -DWXUSINGDLL
    12382 12381 
     @COND_SHARED_0@____SHARED =
    12383 12382 
     @COND_SHARED_1@____SHARED = $(PIC_FLAG)
    12384 
    -@COND_MONOLITHIC_0_SHARED_1@__wx = -DWXUSINGDLL
    12385 12383 
     @COND_TOOLKIT_MSW@__webview_additional_include_wrl_p_0 = \
    12386 12384 
     @COND_TOOLKIT_MSW@	--include-dir $(top_srcdir)/include/wx/msw/wrl
    12387 12385 
     @COND_TOOLKIT_MSW@__webview_additional_include_p_0 = \

  • build/bakefiles/common.bkl
    ... ... @@ -407,13 +407,7 @@
    407 407 
             <install-to>$(LIBDIR)</install-to>
    408 408 
         </template>
    409 409
    410 
    -    <template id="3rdparty_lib" template="common_settings,anylib">
    411 
    -        <if cond="FORMAT=='autoconf'">
    412 
    -            <libname>$(id)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</libname>
    413 
    -        </if>
    414 
    -        <if cond="FORMAT!='autoconf'">
    415 
    -            <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
    416 
    -        </if>
    410 
    +    <template id="3rdparty_lib_base" template="common_settings,anylib">
    417 411 
             <!--
    418 412 
             we want to install 3rd party libs system-wide only with static
    419 413 
             version of wxWidgets; otherwise they are embedded in shared libs:
    ... ... @@ -438,6 +432,33 @@
    438 432 
             </if>
    439 433 
         </template>
    440 434
    435 
    +    <!--
    436 
    +        This template is used for most third party libraries.
    437 
    +
    438 
    +        Note: when inheriting from this template, template_append should
    439 
    +        be normally used instead of just template, to ensure that the built-in
    440 
    +        third party libraries include directories appear before the ones
    441 
    +        defined here (which could include the same headers).
    442 
    +    -->
    443 
    +    <template id="3rdparty_lib" template="3rdparty_lib_base">
    444 
    +        <if cond="FORMAT=='autoconf'">
    445 
    +            <libname>$(id)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</libname>
    446 
    +        </if>
    447 
    +        <if cond="FORMAT!='autoconf'">
    448 
    +            <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
    449 
    +        </if>
    450 
    +    </template>
    451 
    +
    452 
    +    <!-- This one is only used by wxregex currently and additionally includes
    453 
    +         "u" suffix in the library name for compatibility. -->
    454 
    +    <template id="3rdparty_lib_u" template="3rdparty_lib_base">
    455 
    +        <libname cond="FORMAT=='autoconf'">
    456 
    +            $(id)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
    457 
    +        </libname>
    458 
    +        <libname cond="FORMAT!='autoconf'">
    459 
    +            $(id)u$(WXDEBUGFLAG)$(HOST_SUFFIX)
    460 
    +        </libname>
    461 
    +    </template>
    441 462
    442 463 
         <!-- deal with the need to copy setup.h here: -->
    443 464

  • build/bakefiles/expat.bkl
    ... ... @@ -23,7 +23,7 @@
    23 23 
             <if cond="wxUSE_EXPAT=='builtin'">$(TOP_SRCDIR)src/expat/expat/lib</if>
    24 24 
         </set>
    25 25
    26 
    -    <lib id="wxexpat" template="3rdparty_lib"
    26 
    +    <lib id="wxexpat" template_append="3rdparty_lib"
    27 27 
              cond="wxUSE_EXPAT=='builtin' and BUILDING_LIB=='1'">
    28 28 
             <dirname>$(LIBDIRNAME)</dirname>
    29 29 
             <include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include>

  • build/bakefiles/jpeg.bkl
    ... ... @@ -21,7 +21,7 @@
    21 21 
             <if cond="wxUSE_LIBJPEG=='builtin'">$(TOP_SRCDIR)src/jpeg</if>
    22 22 
         </set>
    23 23
    24 
    -    <lib id="wxjpeg" template="3rdparty_lib"
    24 
    +    <lib id="wxjpeg" template_append="3rdparty_lib"
    25 25 
              cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">
    26 26 
             <dirname>$(LIBDIRNAME)</dirname>
    27 27 
             <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>

  • build/bakefiles/lexilla.bkl
    ... ... @@ -29,7 +29,7 @@
    29 29 
             <if cond="SHARED=='1' and MONOLITHIC=='0'">WXUSINGDLL</if>
    30 30 
         </set>
    31 31
    32 
    -    <lib id="wxlexilla" template="3rdparty_lib,wxlexilla_cppflags,msvc_setup_h"
    32 
    +    <lib id="wxlexilla" template_append="3rdparty_lib,wxlexilla_cppflags,msvc_setup_h"
    33 33 
              cond="USE_STC=='1' and BUILDING_LIB=='1'">
    34 34 
             <if cond="FORMAT!='autoconf'">
    35 35 
                 <include>$(SETUPHDIR)</include>

  • build/bakefiles/png.bkl
    ... ... @@ -21,7 +21,7 @@
    21 21 
             <if cond="wxUSE_LIBPNG=='builtin'">$(TOP_SRCDIR)src/png</if>
    22 22 
         </set>
    23 23
    24 
    -    <lib id="wxpng" template="3rdparty_lib"
    24 
    +    <lib id="wxpng" template_append="3rdparty_lib"
    25 25 
              cond="wxUSE_LIBPNG=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">
    26 26 
             <dirname>$(LIBDIRNAME)</dirname>
    27 27 
             <include>$(INC_ZLIB)</include>

  • build/bakefiles/regex.bkl
    ... ... @@ -29,14 +29,8 @@
    29 29 
             </if>
    30 30 
         </set>
    31 31
    32 
    -    <lib id="wxregex" template="msvc_setup_h,3rdparty_lib"
    32 
    +    <lib id="wxregex" template_append="msvc_setup_h,3rdparty_lib_u"
    33 33 
              cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
    34 
    -        <libname cond="FORMAT=='autoconf'">
    35 
    -            $(id)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
    36 
    -        </libname>
    37 
    -        <libname cond="FORMAT!='autoconf'">
    38 
    -            $(id)u$(WXDEBUGFLAG)$(HOST_SUFFIX)
    39 
    -        </libname>
    40 34 
             <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
    41 35 
             <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
    42 36 
             <include cond="FORMAT!='autoconf'">$(INC_REGEX)</include>

  • build/bakefiles/scintilla.bkl
    ... ... @@ -39,7 +39,7 @@
    39 39 
             <if cond="SHARED=='1' and MONOLITHIC=='0'">WXUSINGDLL</if>
    40 40 
         </set>
    41 41
    42 
    -    <lib id="wxscintilla" template="3rdparty_lib,wxscintilla_cppflags,msvc_setup_h"
    42 
    +    <lib id="wxscintilla" template_append="3rdparty_lib,wxscintilla_cppflags,msvc_setup_h"
    43 43 
              cond="USE_STC=='1' and BUILDING_LIB=='1'">
    44 44 
             <if cond="FORMAT!='autoconf'">
    45 45 
                 <include>$(SETUPHDIR)</include>

  • build/bakefiles/tiff.bkl
    ... ... @@ -35,7 +35,7 @@
    35 35 
             <if cond="PLATFORM_WIN32=='1'">src/tiff/libtiff/tif_win32.c</if>
    36 36 
         </set>
    37 37
    38 
    -    <lib id="wxtiff" template="3rdparty_lib"
    38 
    +    <lib id="wxtiff" template_append="3rdparty_lib"
    39 39 
              cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">
    40 40 
             <dirname>$(LIBDIRNAME)</dirname>
    41 41 
             <include>$(INC_ZLIB)</include>

  • build/bakefiles/webp.bkl
    ... ... @@ -24,18 +24,10 @@
    24 24 
             <if cond="wxUSE_LIBWEBP=='builtin'">$(TOP_SRCDIR)3rdparty/libwebp</if>
    25 25 
         </set>
    26 26
    27 
    -    <!--
    28 
    -        By using this template before 3rdparty_lib template, the include will
    29 
    -        be before includes inherited from 3rdparty_lib (i.e. all WX_CPPFLAGS),
    30 
    -        which could contain system-specific webp paths.
    31 
    -    -->
    32 
    -    <template id="webp_include">
    33 
    -        <include>$(INC_WEBP_BUILD)</include>
    34 
    -    </template>
    35 
    -
    36 
    -    <lib id="wxwebp" template="webp_include,3rdparty_lib"
    27 
    +    <lib id="wxwebp" template_append="3rdparty_lib"
    37 28 
              cond="wxUSE_LIBWEBP=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">
    38 29 
             <dirname>$(LIBDIRNAME)</dirname>
    30 
    +        <include>$(INC_WEBP_BUILD)</include>
    39 31 
             <sources>
    40 32 
                 3rdparty/libwebp/sharpyuv/sharpyuv.c
    41 33 
                 3rdparty/libwebp/sharpyuv/sharpyuv_cpu.c

  • build/bakefiles/zlib.bkl
    ... ... @@ -21,7 +21,7 @@
    21 21 
             <if cond="wxUSE_ZLIB=='builtin'">$(TOP_SRCDIR)src/zlib</if>
    22 22 
         </set>
    23 23
    24 
    -    <lib id="wxzlib" template="3rdparty_lib"
    24 
    +    <lib id="wxzlib" template_append="3rdparty_lib"
    25 25 
              cond="wxUSE_ZLIB=='builtin' and BUILDING_LIB=='1'">
    26 26 
             <dirname>$(LIBDIRNAME)</dirname>
    27 27 
             <cflags-borland>

  • build/msw/makefile.gcc
    ... ... @@ -40,9 +40,9 @@ OBJS = \
    40 40 
     LIBDIRNAME = \
    41 41 
     	..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
    42 42 
     SETUPHDIR = $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)
    43 
    -WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG \
    44 
    -	-I..\..\include -I$(SETUPHDIR) -I..\..\3rdparty\pcre\src\wx -D__WX__ \
    45 
    -	-DHAVE_CONFIG_H $(CPPFLAGS) $(CFLAGS)
    43 
    +WXREGEX_CFLAGS = -I..\..\include -I$(SETUPHDIR) -I..\..\3rdparty\pcre\src\wx \
    44 
    +	-D__WX__ -DHAVE_CONFIG_H $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
    45 
    +	-DNDEBUG $(CPPFLAGS) $(CFLAGS)
    46 46 
     WXREGEX_OBJECTS =  \
    47 47 
     	$(OBJS)\wxregex_pcre2_auto_possess.o \
    48 48 
     	$(OBJS)\wxregex_pcre2_chkdint.o \
    ... ... @@ -91,8 +91,8 @@ WXZLIB_OBJECTS = \
    91 91 
     	$(OBJS)\wxzlib_trees.o \
    92 92 
     	$(OBJS)\wxzlib_uncompr.o \
    93 93 
     	$(OBJS)\wxzlib_zutil.o
    94 
    -WXPNG_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG \
    95 
    -	-I..\..\src\zlib -DPNG_INTEL_SSE $(CPPFLAGS) $(CFLAGS)
    94 
    +WXPNG_CFLAGS = -I..\..\src\zlib -DPNG_INTEL_SSE $(__DEBUGINFO) \
    95 
    +	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG $(CPPFLAGS) $(CFLAGS)
    96 96 
     WXPNG_OBJECTS =  \
    97 97 
     	$(OBJS)\wxpng_png.o \
    98 98 
     	$(OBJS)\wxpng_pngerror.o \
    ... ... @@ -240,8 +240,8 @@ WXWEBP_OBJECTS = \
    240 240 
     	$(OBJS)\wxwebp_rescaler_utils.o \
    241 241 
     	$(OBJS)\wxwebp_thread_utils.o \
    242 242 
     	$(OBJS)\wxwebp_utils.o
    243 
    -WXJPEG_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG \
    244 
    -	-I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS)
    243 
    +WXJPEG_CFLAGS = -I$(SETUPHDIR) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
    244 
    +	$(__THREADSFLAG) -DNDEBUG $(CPPFLAGS) $(CFLAGS)
    245 245 
     WXJPEG_OBJECTS =  \
    246 246 
     	$(OBJS)\wxjpeg_jaricom.o \
    247 247 
     	$(OBJS)\wxjpeg_jcapimin.o \
    ... ... @@ -289,8 +289,8 @@ WXJPEG_OBJECTS = \
    289 289 
     	$(OBJS)\wxjpeg_jquant1.o \
    290 290 
     	$(OBJS)\wxjpeg_jquant2.o \
    291 291 
     	$(OBJS)\wxjpeg_jutils.o
    292 
    -WXTIFF_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG \
    293 
    -	-I..\..\src\zlib -I..\..\src\jpeg -I..\..\src\tiff\libtiff $(CPPFLAGS) \
    292 
    +WXTIFF_CFLAGS = -I..\..\src\zlib -I..\..\src\jpeg -I..\..\src\tiff\libtiff \
    293 
    +	$(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG $(CPPFLAGS) \
    294 294 
     	$(CFLAGS)
    295 295 
     WXTIFF_OBJECTS =  \
    296 296 
     	$(OBJS)\wxtiff_tif_win32.o \
    ... ... @@ -335,16 +335,16 @@ WXTIFF_OBJECTS = \
    335 335 
     	$(OBJS)\wxtiff_tif_write.o \
    336 336 
     	$(OBJS)\wxtiff_tif_zip.o \
    337 337 
     	$(OBJS)\wxtiff_tif_zstd.o
    338 
    -WXEXPAT_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG \
    339 
    -	-I$(LIBDIRNAME) $(CPPFLAGS) $(CFLAGS)
    338 
    +WXEXPAT_CFLAGS = -I$(LIBDIRNAME) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
    339 
    +	$(__THREADSFLAG) -DNDEBUG $(CPPFLAGS) $(CFLAGS)
    340 340 
     WXEXPAT_OBJECTS =  \
    341 341 
     	$(OBJS)\wxexpat_xmlparse.o \
    342 342 
     	$(OBJS)\wxexpat_xmlrole.o \
    343 343 
     	$(OBJS)\wxexpat_xmltok.o
    344 
    -WXSCINTILLA_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
    345 
    -	-DNDEBUG -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src \
    346 
    -	-D__WX__ -I$(SETUPHDIR) -I..\..\include $(__wx) -D__WXMSW__ \
    347 
    -	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
    344 
    +WXSCINTILLA_CXXFLAGS = -I$(SETUPHDIR) -I..\..\include $(__wx) -D__WXMSW__ \
    345 
    +	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
    346 
    +	$(__THREADSFLAG) -DNDEBUG -I..\..\src\stc\scintilla\include \
    347 
    +	-I..\..\src\stc\scintilla\src -D__WX__ $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
    348 348 
     	$(CPPFLAGS) $(CXXFLAGS)
    349 349 
     WXSCINTILLA_OBJECTS =  \
    350 350 
     	$(OBJS)\wxscintilla_AutoComplete.o \
    ... ... @@ -377,12 +377,12 @@ WXSCINTILLA_OBJECTS = \
    377 377 
     	$(OBJS)\wxscintilla_UniqueString.o \
    378 378 
     	$(OBJS)\wxscintilla_ViewStyle.o \
    379 379 
     	$(OBJS)\wxscintilla_XPM.o
    380 
    -WXLEXILLA_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG \
    381 
    -	-I..\..\src\stc\lexilla\access -I..\..\src\stc\lexilla\include \
    382 
    -	-I..\..\src\stc\lexilla\lexlib -I..\..\src\stc\lexilla\include \
    383 
    -	-I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src \
    384 
    -	-I$(SETUPHDIR) -I..\..\include $(__wx) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
    385 
    -	$(__DEBUG_DEFINE_p) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
    380 
    +WXLEXILLA_CXXFLAGS = -I$(SETUPHDIR) -I..\..\include $(__wx) -D__WXMSW__ \
    381 
    +	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
    382 
    +	$(__THREADSFLAG) -DNDEBUG -I..\..\src\stc\lexilla\access \
    383 
    +	-I..\..\src\stc\lexilla\include -I..\..\src\stc\lexilla\lexlib \
    384 
    +	-I..\..\src\stc\lexilla\include -I..\..\src\stc\scintilla\include \
    385 
    +	-I..\..\src\stc\scintilla\src $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
    386 386 
     	$(CXXFLAGS)
    387 387 
     WXLEXILLA_OBJECTS =  \
    388 388 
     	$(OBJS)\wxlexilla_LexillaAccess.o \

  • build/msw/makefile.vc
    ... ... @@ -40,12 +40,12 @@ LIBDIRNAME = \
    40 40 
     	..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
    41 41 
     SETUPHDIR = $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)
    42 42 
     WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \
    43 
    -	$(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxregexu$(WXDEBUGFLAG).pdb \
    43 
    +	/I..\..\include /I$(SETUPHDIR) /I..\..\3rdparty\pcre\src\wx /D__WX__ \
    44 
    +	/DHAVE_CONFIG_H $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxregexu$(WXDEBUGFLAG).pdb \
    44 45 
     	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
    45 46 
     	/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
    46 47 
     	$(__NO_VC_CRTDBG_p) $(__TARGET_CPU_COMPFLAG_p) /DNDEBUG \
    47 
    -	/D_CRT_SECURE_NO_WARNINGS /I..\..\include /I$(SETUPHDIR) \
    48 
    -	/I..\..\3rdparty\pcre\src\wx /D__WX__ /DHAVE_CONFIG_H $(CPPFLAGS) $(CFLAGS)
    48 
    +	/D_CRT_SECURE_NO_WARNINGS $(CPPFLAGS) $(CFLAGS)
    49 49 
     WXREGEX_OBJECTS =  \
    50 50 
     	$(OBJS)\wxregex_pcre2_auto_possess.obj \
    51 51 
     	$(OBJS)\wxregex_pcre2_chkdint.obj \
    ... ... @@ -76,12 +76,13 @@ WXREGEX_OBJECTS = \
    76 76 
     	$(OBJS)\wxregex_pcre2_valid_utf.obj \
    77 77 
     	$(OBJS)\wxregex_pcre2_xclass.obj \
    78 78 
     	$(OBJS)\wxregex_pcre2_chartables.obj
    79 
    -WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_25)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
    79 
    +WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_25)$(__DEBUGRUNTIME) /DWIN32 \
    80 
    +	/D_CRT_NONSTDC_NO_WARNINGS $(__DEBUGINFO) \
    80 81 
     	/Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
    81 82 
     	$(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
    82 83 
     	/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
    83 84 
     	$(__NO_VC_CRTDBG_p) $(__TARGET_CPU_COMPFLAG_p) /DNDEBUG \
    84 
    -	/D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS $(CPPFLAGS) $(CFLAGS)
    85 
    +	/D_CRT_SECURE_NO_WARNINGS $(CPPFLAGS) $(CFLAGS)
    85 86 
     WXZLIB_OBJECTS =  \
    86 87 
     	$(OBJS)\wxzlib_adler32.obj \
    87 88 
     	$(OBJS)\wxzlib_compress.obj \
    ... ... @@ -98,13 +99,13 @@ WXZLIB_OBJECTS = \
    98 99 
     	$(OBJS)\wxzlib_trees.obj \
    99 100 
     	$(OBJS)\wxzlib_uncompr.obj \
    100 101 
     	$(OBJS)\wxzlib_zutil.obj
    101 
    -WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_40)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
    102 
    +WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_40)$(__DEBUGRUNTIME) /DWIN32 \
    103 
    +	/I..\..\src\zlib /DPNG_INTEL_SSE $(__DEBUGINFO) \
    102 104 
     	/Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
    103 105 
     	$(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
    104 106 
     	/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
    105 107 
     	$(__NO_VC_CRTDBG_p) $(__TARGET_CPU_COMPFLAG_p) /DNDEBUG \
    106 
    -	/D_CRT_SECURE_NO_WARNINGS /I..\..\src\zlib /DPNG_INTEL_SSE $(CPPFLAGS) \
    107 
    -	$(CFLAGS)
    108 
    +	/D_CRT_SECURE_NO_WARNINGS $(CPPFLAGS) $(CFLAGS)
    108 109 
     WXPNG_OBJECTS =  \
    109 110 
     	$(OBJS)\wxpng_png.obj \
    110 111 
     	$(OBJS)\wxpng_pngerror.obj \
    ... ... @@ -253,12 +254,12 @@ WXWEBP_OBJECTS = \
    253 254 
     	$(OBJS)\wxwebp_rescaler_utils.obj \
    254 255 
     	$(OBJS)\wxwebp_thread_utils.obj \
    255 256 
     	$(OBJS)\wxwebp_utils.obj
    256 
    -WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_70)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
    257 
    -	/Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
    258 
    -	$(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
    257 
    +WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_70)$(__DEBUGRUNTIME) /DWIN32 /I$(SETUPHDIR) \
    258 
    +	$(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb \
    259 
    +	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
    259 260 
     	/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
    260 261 
     	$(__NO_VC_CRTDBG_p) $(__TARGET_CPU_COMPFLAG_p) /DNDEBUG \
    261 
    -	/D_CRT_SECURE_NO_WARNINGS /I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS)
    262 
    +	/D_CRT_SECURE_NO_WARNINGS $(CPPFLAGS) $(CFLAGS)
    262 263 
     WXJPEG_OBJECTS =  \
    263 264 
     	$(OBJS)\wxjpeg_jaricom.obj \
    264 265 
     	$(OBJS)\wxjpeg_jcapimin.obj \
    ... ... @@ -306,13 +307,14 @@ WXJPEG_OBJECTS = \
    306 307 
     	$(OBJS)\wxjpeg_jquant1.obj \
    307 308 
     	$(OBJS)\wxjpeg_jquant2.obj \
    308 309 
     	$(OBJS)\wxjpeg_jutils.obj
    309 
    -WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_85)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
    310 
    +WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_85)$(__DEBUGRUNTIME) /DWIN32 \
    311 
    +	/I..\..\src\zlib /I..\..\src\jpeg /I..\..\src\tiff\libtiff \
    312 
    +	/D_CRT_NONSTDC_NO_WARNINGS $(__DEBUGINFO) \
    310 313 
     	/Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
    311 314 
     	$(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
    312 315 
     	/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
    313 316 
     	$(__NO_VC_CRTDBG_p) $(__TARGET_CPU_COMPFLAG_p) /DNDEBUG \
    314 
    -	/D_CRT_SECURE_NO_WARNINGS /I..\..\src\zlib /I..\..\src\jpeg \
    315 
    -	/I..\..\src\tiff\libtiff /D_CRT_NONSTDC_NO_WARNINGS $(CPPFLAGS) $(CFLAGS)
    317 
    +	/D_CRT_SECURE_NO_WARNINGS $(CPPFLAGS) $(CFLAGS)
    316 318 
     WXTIFF_OBJECTS =  \
    317 319 
     	$(OBJS)\wxtiff_tif_win32.obj \
    318 320 
     	$(OBJS)\wxtiff_tif_aux.obj \
    ... ... @@ -357,24 +359,25 @@ WXTIFF_OBJECTS = \
    357 359 
     	$(OBJS)\wxtiff_tif_zip.obj \
    358 360 
     	$(OBJS)\wxtiff_tif_zstd.obj
    359 361 
     WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
    360 
    -	$(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \
    362 
    +	/I$(LIBDIRNAME) $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \
    361 363 
     	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
    362 364 
     	/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
    363 365 
     	$(__NO_VC_CRTDBG_p) $(__TARGET_CPU_COMPFLAG_p) /DNDEBUG \
    364 
    -	/D_CRT_SECURE_NO_WARNINGS /I$(LIBDIRNAME) $(CPPFLAGS) $(CFLAGS)
    366 
    +	/D_CRT_SECURE_NO_WARNINGS $(CPPFLAGS) $(CFLAGS)
    365 367 
     WXEXPAT_OBJECTS =  \
    366 368 
     	$(OBJS)\wxexpat_xmlparse.obj \
    367 369 
     	$(OBJS)\wxexpat_xmlrole.obj \
    368 370 
     	$(OBJS)\wxexpat_xmltok.obj
    369 371 
     WXSCINTILLA_CXXFLAGS = /M$(__RUNTIME_LIBS_115)$(__DEBUGRUNTIME) /DWIN32 \
    370 
    -	$(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).pdb \
    371 
    -	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
    372 
    +	/I$(SETUPHDIR) /I..\..\include $(__wx) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
    373 
    +	$(__DEBUG_DEFINE_p) $(__DEBUGINFO) \
    374 
    +	/Fd$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
    375 
    +	$(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
    372 376 
     	/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
    373 377 
     	$(__NO_VC_CRTDBG_p) $(__TARGET_CPU_COMPFLAG_p) /DNDEBUG \
    374 378 
     	/D_CRT_SECURE_NO_WARNINGS /I..\..\src\stc\scintilla\include \
    375 
    -	/I..\..\src\stc\scintilla\src /D__WX__ /I$(SETUPHDIR) /I..\..\include \
    376 
    -	$(__wx) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__RTTIFLAG) \
    377 
    -	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
    379 
    +	/I..\..\src\stc\scintilla\src /D__WX__ $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
    380 
    +	$(CPPFLAGS) $(CXXFLAGS)
    378 381 
     WXSCINTILLA_OBJECTS =  \
    379 382 
     	$(OBJS)\wxscintilla_AutoComplete.obj \
    380 383 
     	$(OBJS)\wxscintilla_CallTip.obj \
    ... ... @@ -407,16 +410,17 @@ WXSCINTILLA_OBJECTS = \
    407 410 
     	$(OBJS)\wxscintilla_ViewStyle.obj \
    408 411 
     	$(OBJS)\wxscintilla_XPM.obj
    409 412 
     WXLEXILLA_CXXFLAGS = /M$(__RUNTIME_LIBS_130)$(__DEBUGRUNTIME) /DWIN32 \
    410 
    -	$(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxlexilla$(WXDEBUGFLAG).pdb \
    411 
    -	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
    413 
    +	/I$(SETUPHDIR) /I..\..\include $(__wx) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
    414 
    +	$(__DEBUG_DEFINE_p) $(__DEBUGINFO) \
    415 
    +	/Fd$(LIBDIRNAME)\wxlexilla$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
    416 
    +	$(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
    412 417 
     	/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
    413 418 
     	$(__NO_VC_CRTDBG_p) $(__TARGET_CPU_COMPFLAG_p) /DNDEBUG \
    414 419 
     	/D_CRT_SECURE_NO_WARNINGS /I..\..\src\stc\lexilla\access \
    415 420 
     	/I..\..\src\stc\lexilla\include /I..\..\src\stc\lexilla\lexlib \
    416 421 
     	/I..\..\src\stc\lexilla\include /I..\..\src\stc\scintilla\include \
    417 
    -	/I..\..\src\stc\scintilla\src /I$(SETUPHDIR) /I..\..\include $(__wx) \
    418 
    -	/D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__RTTIFLAG) \
    419 
    -	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
    422 
    +	/I..\..\src\stc\scintilla\src $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
    423 
    +	$(CXXFLAGS)
    420 424 
     WXLEXILLA_OBJECTS =  \
    421 425 
     	$(OBJS)\wxlexilla_LexillaAccess.obj \
    422 426 
     	$(OBJS)\wxlexilla_LexA68k.obj \

  • build/tools/msvs/buildall.bat
    1 1 
     start cmd /k Call officialbuild.bat vc14x
    2 
    -start cmd /k Call officialbuild.bat vc120
    3 
    -start cmd /k Call officialbuild.bat vc110
    4 
    -start cmd /k Call officialbuild.bat vc100
    5 
    -start cmd /E:ON /V:ON /T:0E /K Call officialbuild.bat vc90
    \ No newline at end of file

  • build/tools/msvs/officialbuild.bat
    ... ... @@ -28,66 +28,26 @@ if "%1" == "vc14x" (
    28 28 
       set compvers=vc14x
    29 29 
       call "%VS140COMNTOOLS%VsDevCmd.bat"
    30 30 
     )
    31 
    -if "%1" == "vc120" (
    32 
    -  @echo Building for vc120 / vs2013
    33 
    -  set comp=120
    34 
    -  set compvers=vc120
    35 
    -  call "%VS120COMNTOOLS%VsDevCmd.bat"
    36 
    -)
    37 
    -if "%1" == "vc110" (
    38 
    -  @echo Building for vc110 / vs2012
    39 
    -  set comp=110
    40 
    -  set compvers=vc110
    41 
    -  call "%VS110COMNTOOLS%VsDevCmd.bat"
    42 
    -)
    43 
    -if "%1" == "vc100" (
    44 
    -  @echo Building for vc100 / vs2010
    45 
    -  set comp=100
    46 
    -  set compvers=vc100
    47 
    -  if "%WINDOWS71SDK%" == "" set WINDOWS71SDK=C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\
    48 
    -  call "%WINDOWS71SDK%SetEnv.cmd"
    49 
    -)
    50 
    -if "%1" == "vc90" (
    51 
    -  @echo Building for vc90 / vs2008
    52 
    -  set comp=90
    53 
    -  set compvers=vc90
    54 
    -  if "%WINDOWS61SDK%" == "" set WINDOWS61SDK=C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\
    55 
    -)
    56 31
    57 32 
     if %compvers% == "Unknown" goto ERR_UNKNOWNCOMP
    58 33
    59 
    -if %compvers% == "vc90" (
    60 
    -@echo ============================================================
    61 
    -@echo This will only succeed if run from a SDK 6.1 command prompt.
    62 
    -@echo ============================================================
    63 
    -)
    64 
    -
    65 34 
     rem Return to the build directory in case we have been moved elsewhere.
    66 35
    67 36 
     cd %VSCMD_START_DIR%
    68 37
    69 38 
     @echo Removing the existing destination so that a complete rebuild occurs.
    70 39
    71 
    -rmdir %compvers%_mswuddll /s /q
    72 40 
     rmdir %compvers%_mswuddll_x64 /s /q
    73 
    -rmdir %compvers%_mswudll /s /q
    74 41 
     rmdir %compvers%_mswudll_x64 /s /q
    75 42
    76 
    -rmdir ..\..\lib\%compvers%_dll /s /q
    77 43 
     rmdir ..\..\lib\%compvers%_x64_dll /s /q
    78 44
    79 45 
     @echo Delete the build output files from the last run.
    80 46
    81 
    -del %compvers%x86_Debug.txt
    82 
    -del %compvers%x86_Release.txt
    83 47 
     del %compvers%x64_Debug.txt
    84 48 
     del %compvers%x64_Release.txt
    85 49
    86 
    -if "%compvers%" == "vc14x" call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x64
    87 
    -if "%compvers%" == "vc120" call "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" x86_amd64
    88 
    -if "%compvers%" == "vc110" call "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" x86_amd64
    89 
    -if "%compvers%" == "vc100" call "%WINDOWS71SDK%SetEnv.Cmd" /X64 /Release
    90 
    -if "%compvers%" == "vc90"  call "%WINDOWS61SDK%SetEnv.Cmd" /X64 /Release
    50 
    +if "%compvers%" == "vc14x" call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x64 10.0.17763.0
    91 51
    92 52 
     @echo 64 bit release build
    93 53
    ... ... @@ -109,44 +69,10 @@ cd %build_dir%
    109 69
    110 70 
     @echo 64 bit debug build
    111 71
    112 
    -if "%compvers%" == "vc100" call "%WINDOWS71SDK%SetEnv.Cmd" /X64 /Debug
    113 
    -if "%compvers%" == "vc90"  call "%WINDOWS61SDK%SetEnv.Cmd" /X64 /Debug
    114 
    -
    115 72 
     nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> %compvers%x64_Debug.txt
    116 73
    117 74 
     if ERRORLEVEL 1 goto ERR_BUILD
    118 75
    119 
    -if "%compvers%" == "vc14x" call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x86
    120 
    -if "%compvers%" == "vc120" call "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" x86
    121 
    -if "%compvers%" == "vc110" call "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" x86
    122 
    -if "%compvers%" == "vc100" call "%WINDOWS71SDK%SetEnv.Cmd" /X86 /Release
    123 
    -if "%compvers%" == "vc90"  call "%WINDOWS61SDK%SetEnv.Cmd" /X86 /Release
    124 
    -
    125 
    -@echo 32 bit release build
    126 
    -
    127 
    -nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 CPPFLAGS=/arch:SSE CFLAGS=/arch:SSE TARGET_CPU=X86 >> %compvers%x86_Release.txt
    128 
    -
    129 
    -if ERRORLEVEL 1 goto ERR_BUILD
    130 
    -
    131 
    -cd ..\..\utils\wxrc
    132 
    -
    133 
    -rmdir %compvers%_mswuddll /s /q
    134 
    -del %compvers%x86_Release.txt
    135 
    -nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 CPPFLAGS=/arch:SSE CFLAGS=/arch:SSE TARGET_CPU=X86 >> %compvers%x86_Release.txt
    136 
    -
    137 
    -cd %build_dir%
    138 
    -
    139 
    -if ERRORLEVEL 1 goto ERR_BUILD
    140 
    -
    141 
    -@echo 32 bit debug build
    142 
    -
    143 
    -if "%compvers%" == "vc100" call "%WINDOWS71SDK%SetEnv.Cmd" /X86 /Debug
    144 
    -if "%compvers%" == "vc90"  call "%WINDOWS61SDK%SetEnv.Cmd" /X86 /Debug
    145 
    -
    146 
    -nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 CPPFLAGS=/arch:SSE CFLAGS=/arch:SSE TARGET_CPU=X86 >> %compvers%x86_Debug.txt
    147 
    -
    148 
    -if ERRORLEVEL 1 goto ERR_BUILD
    149 
    -
    150 76 
     @echo Building Packages
    151 77
    152 78 
     cd %curr_dir%
    ... ... @@ -175,11 +101,8 @@ goto End
    175 101
    176 102 
     :VERSIONS
    177 103 
        @echo.
    178 
    -   @echo Compiler Version: One of -
    104 
    +   @echo Compiler Version:
    179 105 
        @echo vc14x (Requires VS2015)
    180 
    -   @echo vc120
    181 
    -   @echo vc110
    182 
    -   @echo vc100
    183 106 
        @echo.
    184 107
    185 108 
     :End

  • build/tools/msvs/package.bat
    ... ... @@ -50,22 +50,10 @@ if "%wxMINOR_VERSION%" == "9" set wxDLLVers=%wxMAJOR_VERSION%%wxMINOR_VERSION%%w
    50 50
    51 51 
     rem Get rid of any files from the last run.
    52 52
    53 
    -del %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_Dev.7z
    54 
    -del %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleaseDLL.7z
    55 
    -del %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleasePDB.7z
    56 53 
     del %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_Dev.7z
    57 54 
     del %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleaseDLL.7z
    58 55 
     del %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleasePDB.7z
    59 56
    60 
    -rem Package the 32 bit files
    61 
    -
    62 
    -REM Copy wxrc.exe to the dll folder.
    63 
    -copy utils\wxrc\%VCver%_mswudll\wxrc.exe lib\%VCver%_dll
    64 
    -
    65 
    -7z a -t7z %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_Dev.7z lib\%VCver%_dll\mswud  lib\%VCver%_dll\mswu lib\%VCver%_dll\wxMSW%wxDllVers%ud_*.pdb lib\%VCver%_dll\wxbase%wxDllVers%ud_*.pdb lib\%VCver%_dll\wxMSW%wxDllVers%ud_*.dll lib\%VCver%_dll\wxbase%wxDllVers%u*.dll  lib\%VCver%_dll\*.lib lib\%VCver%_dll\wxrc.exe
    66 
    -7z a -t7z %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleaseDLL.7z lib\%VCver%_dll\wxMSW%wxDllVers%u_*.dll lib\%VCver%_dll\wxbase%wxDllVers%u_*.dll
    67 
    -7z a -t7z %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleasePDB.7z lib\%VCver%_dll\wxMSW%wxDllVers%u_*.pdb lib\%VCver%_dll\wxbase%wxDllVers%u_*.pdb
    68 
    -
    69 57 
     rem Package the 64 bit files
    70 58
    71 59 
     REM Copy wxrc.exe to the dll folder.
    ... ... @@ -77,7 +65,6 @@ copy utils\wxrc\%VCver%_x64_mswudll\wxrc.exe lib\%VCver%_x64_dll
    77 65
    78 66 
     rem Include the props files: we need wxwidgets.props itself and wx_setup.props
    79 67 
     rem included from it.
    80 
    -7z a -t7z %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_Dev.7z build\msw\wx_setup.props
    81 68 
     7z a -t7z %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_Dev.7z build\msw\wx_setup.props
    82 69
    83 70 
     copy wxwidgets.props %packagePath%\%VCver%\wxwidgets.props
    ... ... @@ -86,7 +73,6 @@ rem Change to the directory containing wxwidgets.props in order to include it
    86 73 
     rem into the archive without any path.
    87 74 
     cd %packagePath%\%VCver%
    88 75
    89 
    -7z a -t7z wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_Dev.7z wxwidgets.props
    90 76 
     7z a -t7z wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_Dev.7z wxwidgets.props
    91 77
    92 78 
     del wxwidgets.props
    ... ... @@ -95,12 +81,10 @@ rem Change to the directory containing licence file in order to include it
    95 81 
     rem into the archives without any path.
    96 82 
     cd %base_dir%\docs
    97 83
    98 
    -7z a -t7z ..\%packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_Dev.7z licence.txt
    99 
    -7z a -t7z ..\%packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleaseDLL.7z licence.txt
    100 84 
     7z a -t7z ..\%packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_Dev.7z licence.txt
    101 85 
     7z a -t7z ..\%packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleaseDLL.7z licence.txt
    102 86
    103 
    -cd %packagePath%\%VCver%
    87 
    +cd ..\%packagePath%\%VCver%
    104 88 
     del sha1.txt
    105 89 
     rem fciv requires a complete path to files
    106 90 
     fciv %cd%\. -type *.7z -sha1 -wp >> sha1.txt

  • include/wx/longlong.h
    ... ... @@ -17,6 +17,11 @@
    17 17
    18 18 
     #include <limits.h>     // for LONG_MAX
    19 19
    20 
    +#if wxUSE_STREAMS
    21 
    +class WXDLLIMPEXP_FWD_BASE wxTextOutputStream;
    22 
    +class WXDLLIMPEXP_FWD_BASE wxTextInputStream;
    23 
    +#endif
    24 
    +
    20 25 
     class WXDLLIMPEXP_FWD_BASE wxULongLong;
    21 26
    22 27 
     class WXDLLIMPEXP_BASE wxWARN_UNUSED wxLongLong

  • samples/widgets/widgets.cpp
    ... ... @@ -708,7 +708,7 @@ void WidgetsFrame::InitBook()
    708 708 
             m_book->AddPage(nullptr,WidgetsCategories[cat],false,0);
    709 709 
     #else
    710 710 
             m_book->AddPage(books[cat],WidgetsCategories[cat],false,0);
    711 
    -        books[cat]->SetImageList(imageList);
    711 
    +        books[cat]->SetImages(imageList);
    712 712 
     #endif
    713 713
    714 714 
             // now do add them

Reply all
Reply to author
Forward
0 new messages