Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-03-23 18:54:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add support for using LunaSVG for SVG rasterization

Browse Source 
Optionally use LunaSVG library from the new submodule instead of
NanoSVG.

Closes #25902.
This commit is contained in:
Randalphwa
2025-08-27 10:39:41 -07:00
committed by Vadim Zeitlin
parent 13de999a2b
commit 6228eaf449
359 changed files with 3322 additions and 1236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@@ -122,7 +122,7 @@ jobs:
use_xvfb: true
- name: Ubuntu 24.04 wxGTK UBSAN
runner: ubuntu-24.04
configure_flags: --with-cxx=20
configure_flags: --with-lunasvg --with-cxx=20
extra_warnings: -Wsuggest-override
use_ubsan: true
use_xvfb: true

6
.github/workflows/ci_msw.yml vendored
View File

@@ -96,6 +96,12 @@ jobs:
if ( $use_cxx20 ) {
cd ..\..\..\build\msw
cp cxx20.props wx_local.props
# Enable Lunasvg for C++20 builds
cd ..\..\include\wx\msw
$txt = Get-Content setup.h
Write-Output $txt |
%{$_ -replace "#define wxUSE_LUNASVG 0", "#define wxUSE_LUNASVG 1"} |
Set-Content setup.h
}
- name: Add MSBuild to PATH

3
.gitmodules vendored
View File

@@ -42,3 +42,6 @@
path = 3rdparty/libwebp
url = https://github.com/wxWidgets/libwebp.git
branch = wx
[submodule "3rdparty/lunasvg"]
path = 3rdparty/lunasvg
url = https://github.com/wxWidgets/lunasvg.git

1
3rdparty/lunasvg vendored Submodule

Submodule 3rdparty/lunasvg added at c4d4142fda

572
Makefile.in
View File

File diff suppressed because it is too large Load Diff

18
autoconf_inc.m4
View File

File diff suppressed because one or more lines are too long

1
build/autogen.mk
View File

@@ -32,6 +32,7 @@ BAKEFILES=\
build/bakefiles/files.bkl \
build/bakefiles/jpeg.bkl \
build/bakefiles/lexilla.bkl \
build/bakefiles/lunasvg.bkl \
build/bakefiles/mac_bundles.bkl \
build/bakefiles/monolithic.bkl \
build/bakefiles/multilib.bkl \

4
build/bakefiles/common.bkl
View File

@@ -556,6 +556,7 @@ $(TAB)cl /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
<include file="expat.bkl"/>
<include file="scintilla.bkl"/>
<include file="lexilla.bkl"/>
<include file="lunasvg.bkl"/>
<!-- =============================================================== -->
@@ -668,6 +669,7 @@ $(TAB)cl /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
<sys-lib>$(LIB_JPEG)</sys-lib>
<sys-lib>$(LIB_PNG)</sys-lib>
<sys-lib>$(LIB_WEBP)</sys-lib>
<sys-lib>$(LIB_LUNASVG)</sys-lib>
<ldlibs>$(LIB_GTK)</ldlibs>
<ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs>
</template>
@@ -787,6 +789,7 @@ $(TAB)cl /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
<depends>wxjpeg</depends>
<depends>wxpng</depends>
<depends>wxwebp</depends>
<depends>wxlunasvg</depends>
<depends>wxscintilla</depends>
<depends>wxlexilla</depends>
</template>
@@ -804,6 +807,7 @@ $(TAB)cl /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
<include>$(INC_JPEG)</include>
<include>$(INC_PNG)</include>
<include>$(INC_WEBP)</include>
<include>$(INC_LUNASVG)</include>
</template>
<template id="wx_lib"

8
build/bakefiles/config.bkl
View File

@@ -298,6 +298,14 @@ Default is to use debug CRT if and only if BUILD==debug.
</description>
</option>
<option name="USE_LUNASVG">
<values>0,1</values>
<default-value>0</default-value>
<description>
Build lunasvg library (requires C++17, USE_GUI must be 1)?
</description>
</option>
<option name="USE_OPENGL">
<values>0,1</values>
<default-value>1</default-value>

53
build/bakefiles/lunasvg.bkl Normal file
View File

@@ -0,0 +1,53 @@
<?xml version="1.0" ?>
<makefile>
<if cond="FORMAT=='autoconf'">
<set var="LIB_LUNASVG">
<if cond="USE_LUNASVG=='1' and USE_GUI=='1'">
wxlunasvg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</if>
</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="LIB_LUNASVG">
<if cond="USE_LUNASVG=='1' and USE_GUI=='1'">
wxlunasvg$(WXDEBUGFLAG)$(HOST_SUFFIX)
</if>
</set>
</if>
<set var="INC_LUNASVG">
<if cond="USE_LUNASVG=='1'">$(TOP_SRCDIR)3rdparty/lunasvg/include</if>
</set>
<lib id="wxlunasvg" template_append="3rdparty_lib"
cond="USE_LUNASVG=='1' and USE_GUI=='1' and BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<include>$(TOP_SRCDIR)3rdparty/lunasvg/include</include>
<include>$(TOP_SRCDIR)3rdparty/lunasvg/plutovg/include</include>
<sources>
3rdparty/lunasvg/source/lunasvg.cpp
3rdparty/lunasvg/source/graphics.cpp
3rdparty/lunasvg/source/svgelement.cpp
3rdparty/lunasvg/source/svggeometryelement.cpp
3rdparty/lunasvg/source/svglayoutstate.cpp
3rdparty/lunasvg/source/svgpaintelement.cpp
3rdparty/lunasvg/source/svgparser.cpp
3rdparty/lunasvg/source/svgproperty.cpp
3rdparty/lunasvg/source/svgrenderstate.cpp
3rdparty/lunasvg/source/svgtextelement.cpp
3rdparty/lunasvg/plutovg/source/plutovg-blend.c
3rdparty/lunasvg/plutovg/source/plutovg-canvas.c
3rdparty/lunasvg/plutovg/source/plutovg-font.c
3rdparty/lunasvg/plutovg/source/plutovg-matrix.c
3rdparty/lunasvg/plutovg/source/plutovg-paint.c
3rdparty/lunasvg/plutovg/source/plutovg-path.c
3rdparty/lunasvg/plutovg/source/plutovg-rasterize.c
3rdparty/lunasvg/plutovg/source/plutovg-surface.c
3rdparty/lunasvg/plutovg/source/plutovg-ft-math.c
3rdparty/lunasvg/plutovg/source/plutovg-ft-raster.c
3rdparty/lunasvg/plutovg/source/plutovg-ft-stroker.c
</sources>
</lib>
</makefile>

2
build/cmake/functions.cmake
View File

@@ -754,6 +754,8 @@ function(wx_add_thirdparty_library var_name lib_name help_str)
if(NOT wxUSE_SYS_LIBS)
set(thirdparty_lib_default builtin)
elseif(THIRDPARTY_DEFAULT STREQUAL "OFF")
set(thirdparty_lib_default OFF)
elseif(THIRDPARTY_DEFAULT)
set(thirdparty_lib_default ${THIRDPARTY_DEFAULT})
elseif(THIRDPARTY_DEFAULT_APPLE AND APPLE)

2
build/cmake/lib/CMakeLists.txt
View File

@@ -23,7 +23,7 @@ endif()
# Define third party libraries
set(LIBS_THIRDPARTY regex zlib expat)
if(wxUSE_GUI)
list(APPEND LIBS_THIRDPARTY jpeg png tiff nanosvg webp)
list(APPEND LIBS_THIRDPARTY jpeg png tiff nanosvg webp lunasvg)
endif()
foreach(LIB IN LISTS LIBS_THIRDPARTY)
include(${LIB}.cmake)

2
build/cmake/lib/core/CMakeLists.txt
View File

@@ -60,7 +60,7 @@ elseif(WXX11)
endif()
wx_add_library(wxcore ${CORE_SRC})
foreach(lib JPEG PNG TIFF NANOSVG WebP)
foreach(lib JPEG PNG TIFF NANOSVG WebP LUNASVG)
if(${lib}_LIBRARIES)
wx_lib_link_libraries(wxcore PRIVATE ${${lib}_LIBRARIES})
endif()

46
build/cmake/lib/lunasvg.cmake Normal file
View File

@@ -0,0 +1,46 @@
#############################################################################
# Name: build/cmake/lib/lunasvg.cmake
# Purpose: LunaSVG SVG rendering library
# Author: Randalphwa
# Created: 2024-03-27
# Copyright: (c) 2024 wxWidgets development team
# Licence: wxWindows licence
#############################################################################
if(wxUSE_LUNASVG STREQUAL "sys")
message(FATAL_ERROR "Not supported")
endif()
if(wxUSE_LUNASVG STREQUAL "ON" OR wxUSE_LUNASVG STREQUAL "builtin")
wx_add_builtin_library(wxlunasvg
3rdparty/lunasvg/source/lunasvg.cpp
3rdparty/lunasvg/source/graphics.cpp
3rdparty/lunasvg/source/svgelement.cpp
3rdparty/lunasvg/source/svggeometryelement.cpp
3rdparty/lunasvg/source/svglayoutstate.cpp
3rdparty/lunasvg/source/svgpaintelement.cpp
3rdparty/lunasvg/source/svgparser.cpp
3rdparty/lunasvg/source/svgproperty.cpp
3rdparty/lunasvg/source/svgrenderstate.cpp
3rdparty/lunasvg/source/svgtextelement.cpp
3rdparty/lunasvg/plutovg/source/plutovg-blend.c
3rdparty/lunasvg/plutovg/source/plutovg-canvas.c
3rdparty/lunasvg/plutovg/source/plutovg-font.c
3rdparty/lunasvg/plutovg/source/plutovg-matrix.c
3rdparty/lunasvg/plutovg/source/plutovg-paint.c
3rdparty/lunasvg/plutovg/source/plutovg-path.c
3rdparty/lunasvg/plutovg/source/plutovg-rasterize.c
3rdparty/lunasvg/plutovg/source/plutovg-surface.c
3rdparty/lunasvg/plutovg/source/plutovg-ft-math.c
3rdparty/lunasvg/plutovg/source/plutovg-ft-raster.c
3rdparty/lunasvg/plutovg/source/plutovg-ft-stroker.c
)
target_include_directories(wxlunasvg PRIVATE
${wxSOURCE_DIR}/3rdparty/lunasvg/include
${wxSOURCE_DIR}/3rdparty/lunasvg/plutovg/include
)
set(LUNASVG_LIBRARIES wxlunasvg)
set(LUNASVG_INCLUDE_DIRS ${wxSOURCE_DIR}/3rdparty/lunasvg/include)
endif()

1
build/cmake/options.cmake
View File

@@ -147,6 +147,7 @@ wx_add_thirdparty_library(wxUSE_LIBPNG PNG "use libpng (PNG image format)")
wx_add_thirdparty_library(wxUSE_LIBTIFF TIFF "use libtiff (TIFF file format)")
wx_add_thirdparty_library(wxUSE_LIBWEBP WebP "use libwebp (WebP file format)")
wx_add_thirdparty_library(wxUSE_NANOSVG NanoSVG "use NanoSVG for rasterizing SVG" DEFAULT builtin)
wx_add_thirdparty_library(wxUSE_LUNASVG LunaSVG "use LunaSVG for rasterizing SVG (C++17 minimum)" DEFAULT OFF)
wx_option(wxUSE_LIBLZMA "use LZMA compression" OFF)
set(wxTHIRD_PARTY_LIBRARIES ${wxTHIRD_PARTY_LIBRARIES} wxUSE_LIBLZMA "use liblzma for LZMA compression")

2
build/cmake/setup.h.in
View File

@@ -570,6 +570,8 @@
#cmakedefine01 wxUSE_NANOSVG_EXTERNAL
#cmakedefine01 wxUSE_LUNASVG
#cmakedefine01 wxUSE_TGA
#cmakedefine01 wxUSE_GIF

3
build/msw/config.gcc
View File

@@ -98,6 +98,9 @@ USE_RICHTEXT ?= 1
# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]
USE_STC ?= 1
# Build lunasvg library (requires C++17, USE_GUI must be 1)? [0,1]
USE_LUNASVG ?= 0
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
USE_OPENGL ?= 1

3
build/msw/config.vc
View File

@@ -112,6 +112,9 @@ USE_RICHTEXT = 1
# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]
USE_STC = 1
# Build lunasvg library (requires C++17, USE_GUI must be 1)? [0,1]
USE_LUNASVG = 0
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
USE_OPENGL = 1

547
build/msw/makefile.gcc
View File

File diff suppressed because it is too large Load Diff

907
build/msw/makefile.vc
View File

File diff suppressed because it is too large Load Diff

96
configure vendored
View File

@@ -693,6 +693,7 @@ COND_USE_RTTI_0
COND_USE_PLUGINS_0
COND_USE_PCH_1
COND_USE_OPENGL_1
COND_USE_LUNASVG_1
COND_USE_GUI_1_wxUSE_LIBWEBP_builtin
COND_USE_GUI_1_wxUSE_LIBTIFF_builtin
COND_USE_GUI_1_wxUSE_LIBPNG_builtin
@@ -700,6 +701,7 @@ COND_USE_GUI_1_wxUSE_LIBJPEG_builtin
COND_USE_GUI_1_WXUNIV_1
COND_USE_GUI_1_WXUNIV_0
COND_USE_GUI_1_USE_OPENGL_1
COND_USE_GUI_1_USE_LUNASVG_1
COND_USE_GUI_1
COND_USE_GUI_0
COND_USE_EXCEPTIONS_1
@@ -747,6 +749,7 @@ COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin
COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin
COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1
COND_SHARED_0_USE_GUI_1_USE_LUNASVG_1
COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0
COND_SHARED_0
@@ -1050,7 +1053,6 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -1116,6 +1118,7 @@ with_libnotify
with_opengl
with_xtest
with_nanosvg
with_lunasvg
with_cairo
with_dmalloc
with_sdl
@@ -1506,7 +1509,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1759,15 +1761,6 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1905,7 +1898,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir runstatedir
libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -2058,7 +2051,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -2402,6 +2394,7 @@ Optional Packages:
--with-opengl use OpenGL (or Mesa)
--with-xtest use XTest extension
--with-nanosvg use NanoSVG for rasterizing SVG
--with-lunasvg use LunaSVG for rasterizing SVG
--with-cairo use Cairo-based wxGraphicsContext implementation
--with-dmalloc use dmalloc library (http://dmalloc.com/)
--with-sdl use SDL for audio on Unix
@@ -4080,6 +4073,7 @@ DEFAULT_wxUSE_LIBMSPACK=no
DEFAULT_wxUSE_LIBSDL=no
DEFAULT_wxUSE_LIBLZMA=no
DEFAULT_wxUSE_CAIRO=no
DEFAULT_wxUSE_LUNASVG=no
DEFAULT_wxUSE_ACCESSIBILITY=no
DEFAULT_wxUSE_UNICODE_UTF8=no
@@ -5196,6 +5190,35 @@ fi
eval "$wx_cv_use_nanosvg"
withstring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
if test x"$withstring" = xwithout; then
defaultval=yes
else
defaultval=no
fi
fi
# Check whether --with-lunasvg was given.
if test "${with_lunasvg+set}" = set; then :
withval=$with_lunasvg;
if test "$withval" = yes; then
wx_cv_use_lunasvg='wxUSE_LUNASVG=yes'
else
wx_cv_use_lunasvg='wxUSE_LUNASVG=no'
fi
else
wx_cv_use_lunasvg='wxUSE_LUNASVG=${'DEFAULT_wxUSE_LUNASVG":-$defaultval}"
fi
eval "$wx_cv_use_lunasvg"
if test "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
wx_needs_cairo_for_gc=1
fi
@@ -15539,6 +15562,10 @@ case "${wxWITH_CXX-$wxDEFAULT_CXXSTD}" in
as_fn_error $? "Using wxWebView Chromium backend requires C++14 or later." "$LINENO" 5
fi
if test "$wxUSE_LUNASVG" = "yes"; then
as_fn_error $? "Using LunaSVG requires C++17 or later" "$LINENO" 5
fi
ax_cxx_compile_alternatives="11 0x" ax_cxx_compile_cxx11_required=true
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -16533,6 +16560,10 @@ $as_echo "#define HAVE_CXX11 1" >>confdefs.h
;;
14)
if test "$wxUSE_LUNASVG" = "yes"; then
as_fn_error $? "Using LunaSVG requires C++17 or later" "$LINENO" 5
fi
ax_cxx_compile_alternatives="14 1y" ax_cxx_compile_cxx14_required=true
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -27456,6 +27487,14 @@ if test "$wxUSE_NANOSVG" = "yes"; then
fi
if test "$wxUSE_LUNASVG" = "yes"; then
$as_echo "#define wxUSE_LUNASVG 1" >>confdefs.h
else
USE_LUNASVG=0
fi
if test "$wxUSE_XML" != "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XML library not built, cannot build wxrc" >&5
$as_echo "$as_me: WARNING: XML library not built, cannot build wxrc" >&2;}
@@ -39894,6 +39933,22 @@ fi
fi
USE_LUNASVG=0
if test "$wxUSE_LUNASVG" = "yes"; then
if ! test -f "$srcdir/3rdparty/lunasvg/include/lunasvg.h" ; then
as_fn_error $? "
The required lunasvg header was not found. You probably need to run
git submodule update --init 3rdparty/lunasvg
to fix this." "$LINENO" 5
fi
$as_echo "#define wxUSE_LUNASVG 1" >>confdefs.h
USE_LUNASVG=1
fi
if test "$wxUSE_MENUS" = "yes"; then
$as_echo "#define wxUSE_MENUS 1" >>confdefs.h
@@ -43439,6 +43494,11 @@ EOF
COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0=""
fi
COND_SHARED_0_USE_GUI_1_USE_LUNASVG_1="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_LUNASVG" = "x1" ; then
COND_SHARED_0_USE_GUI_1_USE_LUNASVG_1=""
fi
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
@@ -43674,6 +43734,11 @@ EOF
COND_USE_GUI_1=""
fi
COND_USE_GUI_1_USE_LUNASVG_1="#"
if test "x$USE_GUI" = "x1" -a "x$USE_LUNASVG" = "x1" ; then
COND_USE_GUI_1_USE_LUNASVG_1=""
fi
COND_USE_GUI_1_USE_OPENGL_1="#"
if test "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
COND_USE_GUI_1_USE_OPENGL_1=""
@@ -43709,6 +43774,11 @@ EOF
COND_USE_GUI_1_wxUSE_LIBWEBP_builtin=""
fi
COND_USE_LUNASVG_1="#"
if test "x$USE_LUNASVG" = "x1" ; then
COND_USE_LUNASVG_1=""
fi
COND_USE_OPENGL_1="#"
if test "x$USE_OPENGL" = "x1" ; then
COND_USE_OPENGL_1=""

35
configure.ac
View File

@@ -320,6 +320,7 @@ DEFAULT_wxUSE_LIBMSPACK=no
DEFAULT_wxUSE_LIBSDL=no
DEFAULT_wxUSE_LIBLZMA=no
DEFAULT_wxUSE_CAIRO=no
DEFAULT_wxUSE_LUNASVG=no
dnl features disabled by default
DEFAULT_wxUSE_ACCESSIBILITY=no
@@ -541,6 +542,7 @@ WX_ARG_WITH(libnotify, [ --with-libnotify use libnotify for notifica
WX_ARG_WITH(opengl, [ --with-opengl use OpenGL (or Mesa)], wxUSE_OPENGL)
WX_ARG_WITH(xtest, [ --with-xtest use XTest extension], wxUSE_XTEST)
WX_ARG_WITH(nanosvg, [ --with-nanosvg use NanoSVG for rasterizing SVG], wxUSE_NANOSVG)
WX_ARG_WITH(lunasvg, [ --with-lunasvg use LunaSVG for rasterizing SVG], wxUSE_LUNASVG)
if test "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
wx_needs_cairo_for_gc=1
@@ -1126,10 +1128,18 @@ case "${wxWITH_CXX-$wxDEFAULT_CXXSTD}" in
AC_MSG_ERROR([Using wxWebView Chromium backend requires C++14 or later.])
fi
if test "$wxUSE_LUNASVG" = "yes"; then
AC_MSG_ERROR([Using LunaSVG requires C++17 or later])
fi
AX_CXX_COMPILE_STDCXX(11)
;;
14)
if test "$wxUSE_LUNASVG" = "yes"; then
AC_MSG_ERROR([Using LunaSVG requires C++17 or later])
fi
AX_CXX_COMPILE_STDCXX(14)
;;
@@ -2761,6 +2771,16 @@ if test "$wxUSE_NANOSVG" = "yes"; then
AC_DEFINE(wxUSE_NANOSVG)
fi
dnl ------------------------------------------------------------------------
dnl Check for LunaSVG libraries
dnl ------------------------------------------------------------------------
if test "$wxUSE_LUNASVG" = "yes"; then
AC_DEFINE(wxUSE_LUNASVG)
else
USE_LUNASVG=0
fi
dnl ------------------------------------------------------------------------
dnl XML and wxrc
dnl ------------------------------------------------------------------------
@@ -6972,6 +6992,21 @@ if test "$wxUSE_STC" = "yes"; then
AC_SUBST(COND_PYTHON)
fi
USE_LUNASVG=0
if test "$wxUSE_LUNASVG" = "yes"; then
if ! test -f "$srcdir/3rdparty/lunasvg/include/lunasvg.h" ; then
AC_MSG_ERROR([
The required lunasvg header was not found. You probably need to run
git submodule update --init 3rdparty/lunasvg
to fix this.])
fi
AC_DEFINE(wxUSE_LUNASVG)
USE_LUNASVG=1
fi
if test "$wxUSE_MENUS" = "yes"; then
AC_DEFINE(wxUSE_MENUS)
if test "$wxUSE_MENUBAR" = "yes"; then

5
demos/bombs/Makefile.in
View File

@@ -132,6 +132,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_USE_GUI_1_wxUSE_LIBWEBP_builtin@__LIB_WEBP_p \
@COND_USE_GUI_1_wxUSE_LIBWEBP_builtin@ = \
@COND_USE_GUI_1_wxUSE_LIBWEBP_builtin@ -lwxwebp$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_USE_GUI_1_USE_LUNASVG_1@__LIB_LUNASVG_p \
@COND_USE_GUI_1_USE_LUNASVG_1@ = \
@COND_USE_GUI_1_USE_LUNASVG_1@ -lwxlunasvg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = \
@@ -159,7 +162,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch Makefile
bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc)
$(CXX) -o $@ $(BOMBS_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS_GUI) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(CXX) -o $@ $(BOMBS_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS_GUI) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(__bombs___os2_emxbindcmd)
@COND_PLATFORM_MACOSX_1@bombs.app/Contents/PkgInfo: bombs$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns

7
demos/bombs/makefile.gcc
View File

@@ -166,6 +166,11 @@ endif
ifeq ($(USE_GUI),1)
__LIB_WEBP_p = -lwxwebp$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
ifeq ($(USE_LUNASVG),1)
__LIB_LUNASVG_p = -lwxlunasvg$(WXDEBUGFLAG)
endif
endif
ifeq ($(USE_CAIRO),1)
__CAIRO_LIB_p = -lcairo
endif
@@ -212,7 +217,7 @@ clean:
$(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs_rc.o
$(foreach f,$(subst \,/,$(BOMBS_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
@-del $@.rsp
$(OBJS)\bombs_bombs.o: ./bombs.cpp

5
demos/bombs/makefile.vc
View File

@@ -406,6 +406,9 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!if "$(USE_GUI)" == "1"
__LIB_WEBP_p = wxwebp$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1" && "$(USE_LUNASVG)" == "1"
__LIB_LUNASVG_p = wxlunasvg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_CAIRO)" == "1"
__CAIRO_LIB_p = cairo.lib
!endif
@@ -432,7 +435,7 @@ clean:
$(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bombs.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(BOMBS_OBJECTS) $(BOMBS_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib gdiplus.lib msimg32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
$(BOMBS_OBJECTS) $(BOMBS_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib gdiplus.lib msimg32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
<<
$(OBJS)\bombs_bombs.obj: .\bombs.cpp

5
demos/forty/Makefile.in
View File

@@ -144,6 +144,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_USE_GUI_1_wxUSE_LIBWEBP_builtin@__LIB_WEBP_p \
@COND_USE_GUI_1_wxUSE_LIBWEBP_builtin@ = \
@COND_USE_GUI_1_wxUSE_LIBWEBP_builtin@ -lwxwebp$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_USE_GUI_1_USE_LUNASVG_1@__LIB_LUNASVG_p \
@COND_USE_GUI_1_USE_LUNASVG_1@ = \
@COND_USE_GUI_1_USE_LUNASVG_1@ -lwxlunasvg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = \
@@ -171,7 +174,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch Makefile
forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
$(CXX) -o $@ $(FORTY_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS_GUI) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(CXX) -o $@ $(FORTY_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS_GUI) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(__forty___os2_emxbindcmd)
@COND_PLATFORM_MACOSX_1@forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns

7
demos/forty/makefile.gcc
View File

@@ -179,6 +179,11 @@ endif
ifeq ($(USE_GUI),1)
__LIB_WEBP_p = -lwxwebp$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
ifeq ($(USE_LUNASVG),1)
__LIB_LUNASVG_p = -lwxlunasvg$(WXDEBUGFLAG)
endif
endif
ifeq ($(USE_CAIRO),1)
__CAIRO_LIB_p = -lcairo
endif
@@ -225,7 +230,7 @@ clean:
$(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty_rc.o
$(foreach f,$(subst \,/,$(FORTY_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
@-del $@.rsp
data:

5
demos/forty/makefile.vc
View File

@@ -419,6 +419,9 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!if "$(USE_GUI)" == "1"
__LIB_WEBP_p = wxwebp$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1" && "$(USE_LUNASVG)" == "1"
__LIB_LUNASVG_p = wxlunasvg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_CAIRO)" == "1"
__CAIRO_LIB_p = cairo.lib
!endif
@@ -445,7 +448,7 @@ clean:
$(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\forty.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(FORTY_OBJECTS) $(FORTY_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib gdiplus.lib msimg32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
$(FORTY_OBJECTS) $(FORTY_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib gdiplus.lib msimg32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
<<
data:

5
demos/fractal/Makefile.in
View File

@@ -130,6 +130,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_USE_GUI_1_wxUSE_LIBWEBP_builtin@__LIB_WEBP_p \
@COND_USE_GUI_1_wxUSE_LIBWEBP_builtin@ = \
@COND_USE_GUI_1_wxUSE_LIBWEBP_builtin@ -lwxwebp$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_USE_GUI_1_USE_LUNASVG_1@__LIB_LUNASVG_p \
@COND_USE_GUI_1_USE_LUNASVG_1@ = \
@COND_USE_GUI_1_USE_LUNASVG_1@ -lwxlunasvg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = \
@@ -157,7 +160,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch Makefile
fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc)
$(CXX) -o $@ $(FRACTAL_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS_GUI) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(CXX) -o $@ $(FRACTAL_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS_GUI) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(__fractal___os2_emxbindcmd)
@COND_PLATFORM_MACOSX_1@fractal.app/Contents/PkgInfo: fractal$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns

7
demos/fractal/makefile.gcc
View File

@@ -164,6 +164,11 @@ endif
ifeq ($(USE_GUI),1)
__LIB_WEBP_p = -lwxwebp$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
ifeq ($(USE_LUNASVG),1)
__LIB_LUNASVG_p = -lwxlunasvg$(WXDEBUGFLAG)
endif
endif
ifeq ($(USE_CAIRO),1)
__CAIRO_LIB_p = -lcairo
endif
@@ -210,7 +215,7 @@ clean:
$(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal_rc.o
$(foreach f,$(subst \,/,$(FRACTAL_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
@-del $@.rsp
$(OBJS)\fractal_fractal.o: ./fractal.cpp

5
demos/fractal/makefile.vc
View File

@@ -404,6 +404,9 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!if "$(USE_GUI)" == "1"
__LIB_WEBP_p = wxwebp$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1" && "$(USE_LUNASVG)" == "1"
__LIB_LUNASVG_p = wxlunasvg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_CAIRO)" == "1"
__CAIRO_LIB_p = cairo.lib
!endif
@@ -430,7 +433,7 @@ clean:
$(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\fractal.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(FRACTAL_OBJECTS) $(FRACTAL_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib gdiplus.lib msimg32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
$(FRACTAL_OBJECTS) $(FRACTAL_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib gdiplus.lib msimg32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
<<
$(OBJS)\fractal_fractal.obj: .\fractal.cpp

5
demos/life/Makefile.in
View File

@@ -133,6 +133,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_USE_GUI_1_wxUSE_LIBWEBP_builtin@__LIB_WEBP_p \
@COND_USE_GUI_1_wxUSE_LIBWEBP_builtin@ = \
@COND_USE_GUI_1_wxUSE_LIBWEBP_builtin@ -lwxwebp$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_USE_GUI_1_USE_LUNASVG_1@__LIB_LUNASVG_p \
@COND_USE_GUI_1_USE_LUNASVG_1@ = \
@COND_USE_GUI_1_USE_LUNASVG_1@ -lwxlunasvg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = \
@@ -160,7 +163,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch Makefile
life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc)
$(CXX) -o $@ $(LIFE_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS_GUI) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(CXX) -o $@ $(LIFE_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS_GUI) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(__life___os2_emxbindcmd)
@COND_PLATFORM_MACOSX_1@life.app/Contents/PkgInfo: life$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns

7
demos/life/makefile.gcc
View File

@@ -167,6 +167,11 @@ endif
ifeq ($(USE_GUI),1)
__LIB_WEBP_p = -lwxwebp$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
ifeq ($(USE_LUNASVG),1)
__LIB_LUNASVG_p = -lwxlunasvg$(WXDEBUGFLAG)
endif
endif
ifeq ($(USE_CAIRO),1)
__CAIRO_LIB_p = -lcairo
endif
@@ -213,7 +218,7 @@ clean:
$(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life_rc.o
$(foreach f,$(subst \,/,$(LIFE_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
@-del $@.rsp
data:

5
demos/life/makefile.vc
View File

@@ -407,6 +407,9 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!if "$(USE_GUI)" == "1"
__LIB_WEBP_p = wxwebp$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1" && "$(USE_LUNASVG)" == "1"
__LIB_LUNASVG_p = wxlunasvg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_CAIRO)" == "1"
__CAIRO_LIB_p = cairo.lib
!endif
@@ -433,7 +436,7 @@ clean:
$(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\life.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(LIFE_OBJECTS) $(LIFE_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib gdiplus.lib msimg32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
$(LIFE_OBJECTS) $(LIFE_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib gdiplus.lib msimg32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
<<
data:

2
demos/makefile.gcc
View File

@@ -24,7 +24,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
USE_XML="$(USE_XML)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
USE_LUNASVG="$(USE_LUNASVG)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
USE_DPI_AWARE_MANIFEST="$(USE_DPI_AWARE_MANIFEST)" \
USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \

2
demos/makefile.vc
View File

@@ -24,7 +24,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
USE_XML="$(USE_XML)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
USE_LUNASVG="$(USE_LUNASVG)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
USE_DPI_AWARE_MANIFEST="$(USE_DPI_AWARE_MANIFEST)" \
USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \

5
demos/poem/Makefile.in
View File

@@ -134,6 +134,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_USE_GUI_1_wxUSE_LIBWEBP_builtin@__LIB_WEBP_p \
@COND_USE_GUI_1_wxUSE_LIBWEBP_builtin@ = \
@COND_USE_GUI_1_wxUSE_LIBWEBP_builtin@ -lwxwebp$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_USE_GUI_1_USE_LUNASVG_1@__LIB_LUNASVG_p \
@COND_USE_GUI_1_USE_LUNASVG_1@ = \
@COND_USE_GUI_1_USE_LUNASVG_1@ -lwxlunasvg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = \
@@ -161,7 +164,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch Makefile
wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___win32rc)
$(CXX) -o $@ $(WXPOEM_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS_GUI) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(CXX) -o $@ $(WXPOEM_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS_GUI) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(__wxpoem___os2_emxbindcmd)
@COND_PLATFORM_MACOSX_1@wxpoem.app/Contents/PkgInfo: wxpoem$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns

7
demos/poem/makefile.gcc
View File

@@ -168,6 +168,11 @@ endif
ifeq ($(USE_GUI),1)
__LIB_WEBP_p = -lwxwebp$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
ifeq ($(USE_LUNASVG),1)
__LIB_LUNASVG_p = -lwxlunasvg$(WXDEBUGFLAG)
endif
endif
ifeq ($(USE_CAIRO),1)
__CAIRO_LIB_p = -lcairo
endif
@@ -214,7 +219,7 @@ clean:
$(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem_rc.o
$(foreach f,$(subst \,/,$(WXPOEM_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
@-del $@.rsp
data:

5
demos/poem/makefile.vc
View File

@@ -408,6 +408,9 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!if "$(USE_GUI)" == "1"
__LIB_WEBP_p = wxwebp$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1" && "$(USE_LUNASVG)" == "1"
__LIB_LUNASVG_p = wxlunasvg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_CAIRO)" == "1"
__CAIRO_LIB_p = cairo.lib
!endif
@@ -434,7 +437,7 @@ clean:
$(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxpoem.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(WXPOEM_OBJECTS) $(WXPOEM_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib gdiplus.lib msimg32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
$(WXPOEM_OBJECTS) $(WXPOEM_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib gdiplus.lib msimg32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
<<
data:

1
docs/doxygen/mainpages/const_wxusedef.h
View File

@@ -168,6 +168,7 @@ library:
@itemdef{wxUSE_NANOSVG, Use NanoSVG for rasterizing SVG (this option is new since wxWidgets 3.1.7).}
@itemdef{wxUSE_NANOSVG_EXTERNAL, Use an external NanoSVG library when wxUSE_NANOSVG is enabled.}
@itemdef{wxUSE_NANOSVG_EXTERNAL_ENABLE_IMPL, When the external NanoSVG library is header only, define this to enable its implementation.}
@itemdef{wxUSE_LUNASVG, Use LunaSVG for rasterizing SVG (this option is new since wxWidgets 3.3.2).}
@itemdef{wxUSE_NATIVE_DATAVIEWCTRL, Use native wxDataViewCtrl class (this option is new since wxWidgets 3.1.4).}
@itemdef{wxUSE_NATIVE_STATUSBAR, Use native wxStatusBar class.}
@itemdef{wxUSE_NOTEBOOK, Use wxNotebook and related classes.}

4
include/wx/android/setup.h
View File

@@ -1469,6 +1469,10 @@
// Set to 1 to use external nanosvg library when wxUSE_NANOSVG is enabled
#define wxUSE_NANOSVG_EXTERNAL 0
// Set to 1 for SVG rasterizing support using LunaSVG (minimum C++ 17 required)
// Setting to 1 will override wxUSE_NANOSVG
#define wxUSE_LUNASVG 0
// Set to 1 for TGA format support (loading only)
#define wxUSE_TGA 1

2
include/wx/features.h
View File

@@ -93,7 +93,7 @@
support using wxDC::DrawSpline(), currently we don't do it and so FromSVG()
is only available in the ports providing raw bitmap access.
*/
#if defined(wxHAS_RAW_BITMAP) && wxUSE_NANOSVG
#if defined(wxHAS_RAW_BITMAP) && (wxUSE_NANOSVG || wxUSE_LUNASVG)
#define wxHAS_SVG
#endif

4
include/wx/gtk/setup.h
View File

@@ -1469,6 +1469,10 @@
// Set to 1 to use external nanosvg library when wxUSE_NANOSVG is enabled
#define wxUSE_NANOSVG_EXTERNAL 0
// Set to 1 for SVG rasterizing support using LunaSVG (minimum C++ 17 required)
// Setting to 1 will override wxUSE_NANOSVG
#define wxUSE_LUNASVG 0
// Set to 1 for TGA format support (loading only)
#define wxUSE_TGA 1

4
include/wx/msw/setup.h
View File

@@ -1469,6 +1469,10 @@
// Set to 1 to use external nanosvg library when wxUSE_NANOSVG is enabled
#define wxUSE_NANOSVG_EXTERNAL 0
// Set to 1 for SVG rasterizing support using LunaSVG (minimum C++ 17 required)
// Setting to 1 will override wxUSE_NANOSVG
#define wxUSE_LUNASVG 0
// Set to 1 for TGA format support (loading only)
#define wxUSE_TGA 1

4
include/wx/osx/setup.h
View File

@@ -1476,6 +1476,10 @@
// Set to 1 to use external nanosvg library when wxUSE_NANOSVG is enabled
#define wxUSE_NANOSVG_EXTERNAL 0
// Set to 1 for SVG rasterizing support using LunaSVG (minimum C++ 17 required)
// Setting to 1 will override wxUSE_NANOSVG
#define wxUSE_LUNASVG 0
// Set to 1 for TGA format support (loading only)
#define wxUSE_TGA 1

4
include/wx/setup_inc.h
View File

@@ -1465,6 +1465,10 @@
// Set to 1 to use external nanosvg library when wxUSE_NANOSVG is enabled
#define wxUSE_NANOSVG_EXTERNAL 0
// Set to 1 for SVG rasterizing support using LunaSVG (minimum C++ 17 required)
// Setting to 1 will override wxUSE_NANOSVG
#define wxUSE_LUNASVG 0
// Set to 1 for TGA format support (loading only)
#define wxUSE_TGA 1

4
include/wx/univ/setup.h
View File

@@ -1469,6 +1469,10 @@
// Set to 1 to use external nanosvg library when wxUSE_NANOSVG is enabled
#define wxUSE_NANOSVG_EXTERNAL 0
// Set to 1 for SVG rasterizing support using LunaSVG (minimum C++ 17 required)
// Setting to 1 will override wxUSE_NANOSVG
#define wxUSE_LUNASVG 0
// Set to 1 for TGA format support (loading only)
#define wxUSE_TGA 1

18
interface/wx/bmpbndl.h
View File

@@ -249,16 +249,25 @@ public:
/**
Create a bundle from the SVG image.
Please note that the current implementation uses NanoSVG library
(https://github.com/memononen/nanosvg) for parsing and rasterizing SVG
images, which does not support the following:
Please note that the current implementation uses either NanoSVG
library (https://github.com/memononen/nanosvg) or, optionally, since
wxWidgets 3.3.2, LunaSVG library (https://github.com/sammycage/lunasvg)
for parsing and rasterizing SVG images which don't support some SVG
features, including:
- Text elements
- SVG 1.1 filters
- Embedded images
- Clip paths
See note below for possible workarounds.
These limitations may be relaxed in future wxWidgets versions (they are
planned, but not yet implemented in LunaSVG).
@remark To enable LunaSVG library support, use `--with-lunasvg`
configure option, set `wxUSE_LUNASVG=ON` when using CMake or change
wxUSE_LUNASVG set to 1 in your setup.h file when using other build
systems. Note that you will also need to use a C++17 (or later)
compiler required by this library.
Please also note that this method is only available in the ports
providing raw bitmap access via wxPixelData. This is the case for all
@@ -292,6 +301,7 @@ public:
of objects (rather than using a clip path to hide them).
In Inkscape, this can be done via either "Path" → "Difference"
or "Path" → "Division" (i.e., cookie-cutter subtraction).
*/
static wxBitmapBundle FromSVG(char* data, const wxSize& sizeDef);

5
samples/access/Makefile.in
View File

@@ -130,6 +130,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_USE_GUI_1_wxUSE_LIBWEBP_builtin@__LIB_WEBP_p \
@COND_USE_GUI_1_wxUSE_LIBWEBP_builtin@ = \
@COND_USE_GUI_1_wxUSE_LIBWEBP_builtin@ -lwxwebp$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_USE_GUI_1_USE_LUNASVG_1@__LIB_LUNASVG_p \
@COND_USE_GUI_1_USE_LUNASVG_1@ = \
@COND_USE_GUI_1_USE_LUNASVG_1@ -lwxlunasvg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = \
@@ -157,7 +160,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch Makefile
accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc)
$(CXX) -o $@ $(ACCESSTEST_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS_GUI) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(CXX) -o $@ $(ACCESSTEST_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS_GUI) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(__accesstest___os2_emxbindcmd)
@COND_PLATFORM_MACOSX_1@accesstest.app/Contents/PkgInfo: accesstest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns

7
samples/access/makefile.gcc
View File

@@ -164,6 +164,11 @@ endif
ifeq ($(USE_GUI),1)
__LIB_WEBP_p = -lwxwebp$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
ifeq ($(USE_LUNASVG),1)
__LIB_LUNASVG_p = -lwxlunasvg$(WXDEBUGFLAG)
endif
endif
ifeq ($(USE_CAIRO),1)
__CAIRO_LIB_p = -lcairo
endif
@@ -210,7 +215,7 @@ clean:
$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_sample_rc.o
$(foreach f,$(subst \,/,$(ACCESSTEST_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
@-del $@.rsp
$(OBJS)\accesstest_sample_rc.o: ./../../samples/sample.rc

Some files were not shown because too many files have changed in this diff Show More