On 2021/08/18 11:13, Edd Barrett wrote:
> On Mon, Aug 16, 2021 at 03:06:09PM +0100, Edd Barrett wrote:
> > On Fri, Aug 06, 2021 at 10:52:51AM +0100, Edd Barrett wrote:
> > > Comments? OK?
> >
> > Any comments before I commit this?
>
> 0.9.4 was just released. Here's a diff for that...
Build fails on i386 like so - fix below (it does restrict which machines
it will run on slightly, but I don't think that's a big problem)
FAILED: client/CMakeFiles/odamex.dir/src/am_map.cpp.o
/pobj/odamex-0.9.4/bin/c++ -D-march=pentium-m -DCLIENT_APP
-DINSTALL_BINDIR=\"bin\" -DINSTALL_DATADIR=\"share\"
-DINSTALL_PREFIX=\"/usr/local\" -DPORTMIDI -DUNIX -DX11
-I/pobj/odamex-0.9.4/odamex-src-0.9.4/client/sdl -I/pobj/odamex-0.9.
4/odamex-src-0.9.4/client/src -I/usr/X11R6/include
-I/pobj/odamex-0.9.4/odamex-src-0.9.4/client/../libraries/textscreen
-I/pobj/odamex-0.9.4/odamex-src-0.9.4/common/. -Icommon -isystem
/usr/local/include -isystem /usr/local/include/SDL2 -isystem
libraries/local/include -I/usr/local/include/miniupnpc -DNDEBUG -Wall -Wextra
-fcolor-diagnostics -Wnull-dereference -Wformat=2 -Wno-unused-parameter
-std=gnu++98 -MD -MT client/CMakeFiles/odamex.dir/src/am_map.cpp.o -MF
client/CMakeFiles/odamex.dir/src/am_map.cpp.o.d -o
client/CMakeFiles/odamex.dir/src/am_map.cpp.o -c
/pobj/odamex-0.9.4/odamex-src-0.9.4/client/src/am_map.cpp
In file included from <built-in>:348:
<command line>:1:9: error: macro name must be an identifier
#define -march pentium-m
^
In file included from
/pobj/odamex-0.9.4/odamex-src-0.9.4/client/src/am_map.cpp:43:
/pobj/odamex-0.9.4/odamex-src-0.9.4/client/sdl/i_video.h:233:10: warning:
'const' type qualifier on return type has no effect [-Wignored-qualifiers]
virtual const EDisplayType getDisplayType() const = 0;
^~~~~~
/pobj/odamex-0.9.4/odamex-src-0.9.4/client/sdl/i_video.h:280:10: warning:
'const' type qualifier on return type has no effect [-Wignored-qualifiers]
virtual const EDisplayType getDisplayType() const
^~~~~~
2 warnings and 1 error generated.
ninja: build stopped: subcommand failed.
Index: patches/patch-client_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/games/odamex/patches/patch-client_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-client_CMakeLists_txt
--- patches/patch-client_CMakeLists_txt 22 Aug 2021 19:48:24 -0000 1.2
+++ patches/patch-client_CMakeLists_txt 29 Aug 2021 21:57:49 -0000
@@ -3,6 +3,15 @@ $OpenBSD: patch-client_CMakeLists_txt,v
Index: client/CMakeLists.txt
--- client/CMakeLists.txt.orig
+++ client/CMakeLists.txt
+@@ -163,7 +163,7 @@ if(TARGET SDL2::SDL2 OR TARGET SDL::SDL)
+ elseif(ODAMEX_TARGET_ARCH STREQUAL "i386")
+ if(NOT MSVC)
+ # Pentium M has SSE2.
+- target_compile_definitions(odamex PRIVATE -march=pentium-m)
++ target_compile_options(odamex PRIVATE -march=pentium-m)
+ else()
+ target_compile_definitions(odamex PRIVATE /arch:SSE2)
+ endif()
@@ -220,7 +220,7 @@ if(TARGET SDL2::SDL2 OR TARGET SDL::SDL)
endif()
