Our libxml has threading support enable sincd 2019 and the editor works
for me on amd64.

Linking couldn't find "-liconv", so -L is needed.

OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/0ad/base/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile    6 Mar 2023 13:37:15 -0000       1.40
+++ Makefile    11 Apr 2023 10:44:48 -0000
@@ -2,7 +2,7 @@ COMMENT =               historical real-time strategy
 
 DISTNAME =             0ad-${V}-alpha-unix-build
 PKGNAME =              0ad-${V}
-REVISION =             0
+REVISION =             1
 
 USE_WXNEEDED =         Yes
 
@@ -13,6 +13,8 @@ WANTLIB += ${COMPILER_LIBCXX} SDL2 X11 b
 WANTLIB += boost_system c crypto curl enet execinfo fmt freetype gloox iconv
 WANTLIB += icudata icui18n icuuc idn m miniupnpc ogg openal
 WANTLIB += png sodium ssl vorbis vorbisfile xml2 z
+WANTLIB += wx_baseu-3.2 wx_baseu_net-3.2 wx_baseu_xml-3.2 wx_gtk3u_core-3.2
+WANTLIB += wx_gtk3u_gl-3.2 wx_gtk3u_html-3.2 wx_gtk3u_qa-3.2 wx_gtk3u_xrc-3.2
 
 BUILD_DEPENDS =                archivers/zip \
                        lang/rust,-main \
@@ -30,7 +32,8 @@ LIB_DEPENDS =         audio/libvorbis \
                        net/miniupnp/miniupnpc \
                        security/libsodium \
                        textproc/icu4c \
-                       textproc/libxml
+                       textproc/libxml \
+                       x11/wxWidgets,-main
 RUN_DEPENDS =          devel/desktop-file-utils \
                        games/0ad/data=${V}
 MODULES =              lang/python
@@ -45,7 +48,7 @@ MAKE_ENV =            CC="${CC}" \
                        CXX="${CXX}" \
                        CFLAGS="${CFLAGS}" \
                        CXXFLAGS="${CXXFLAGS} -I${X11BASE}/include" \
-                       LDFLAGS="-liconv"
+                       LDFLAGS="-L/usr/local/lib -liconv"
 
 FIX_CRLF_FILES =       build/premake/premake5/build/gmake.bsd/Premake5.make
 
@@ -63,9 +66,6 @@ CONFIGURE_ARGS +=     --without-nvtt \
                        --libdir=${PREFIX}/lib \
                        --minimal-flags
 
-# XXX atlas (the level editor) requires threaded libxml
-CONFIGURE_ARGS +=      --disable-atlas
-
 WRKSRC =               ${WRKDIST}/build/workspaces/gcc
 
 do-build:
@@ -86,6 +86,7 @@ do-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/0ad
        cp -R ${WRKDIST}/binaries/data/* ${PREFIX}/share/0ad
        ${INSTALL_DATA} ${WRKDIST}/binaries/system/lib* ${PREFIX}/lib
+       ${INSTALL_PROGRAM} ${WRKDIST}/binaries/system/ActorEditor ${PREFIX}/bin
        ${INSTALL_PROGRAM} ${WRKDIST}/binaries/system/pyrogenesis ${PREFIX}/bin
        ${INSTALL_SCRIPT} ${WRKDIST}/build/resources/0ad.sh ${PREFIX}/bin/0ad
        ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/0ad/base/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST   9 Oct 2022 07:43:08 -0000       1.13
+++ pkg/PLIST   11 Apr 2023 10:44:48 -0000
@@ -1,5 +1,8 @@
 bin/0ad
+@bin bin/ActorEditor
 @bin bin/pyrogenesis
+@static-lib lib/libAtlasObject.a
+@so lib/libAtlasUI.so
 @so lib/libCollada.so
 @static-lib lib/libatlas.a
 @static-lib lib/libengine.a

Reply via email to