Merge pull request #690 from Kalamatee/ADoom3

AROS build fixes and code cleanup.

Author: DanielGibson

neo/CMakeLists.txt

@@ -237,6 +237,9 @@ if(IMGUI)
 		# we need C++11 for ImGui
 		set (CMAKE_CXX_STANDARD 11)
 		message(STATUS "Dear ImGui integration enabled")
+		if(AROS)
+			add_definitions(-DIMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS)
+		endif()
 	else()
 		message(WARNING "Disabling IMGUI because SDL1.2 is used - it needs SDL2 or SDL3!")
 		set(IMGUI OFF)
@@ -1154,13 +1157,7 @@ endif()
 
 if(AROS)
 	set(DHEWM3BINARY "ADoom3")
-	set(sys_libs ${sys_libs} dll)
-
-	set(src_arosdll
-		sys/aros/dll/dllstartup.c
-		sys/aros/dll/dll.c
-		sys/aros/dll/dllimport.c
-	)
+	set(sys_libs ${sys_libs} dynmod)
 
 	set(src_sys_base
 		sys/cpu.cpp
@@ -1170,6 +1167,8 @@ if(AROS)
 		sys/aros/aros_net.cpp
 		sys/aros/aros_signal.cpp
 		sys/aros/aros_main.cpp
+		 sys/aros/aros_dynmodcommon.cpp
+		sys/aros/aros_support.cpp
 		sys/aros/aros_dos.cpp
 	)
 
@@ -1263,10 +1262,9 @@ if(SDL3)
 	target_link_libraries(idlib SDL3::Headers) # so it can use SDL_Endian.h
 endif()
 if (AROS)
-	add_library(dll STATIC ${src_arosdll})
-        if(CMAKE_SYSTEM_PROCESSOR STREQUAL "i386")
+	if(CMAKE_SYSTEM_PROCESSOR STREQUAL "i386")
 		set(AROS_ARCH "x86")
-        else()
+	else()
 		set(AROS_ARCH ${CMAKE_SYSTEM_PROCESSOR})
 	endif()
 else()
@@ -1371,7 +1369,8 @@ endif()
 
 if(BASE AND NOT HARDLINK_GAME)
 	if (AROS)
-		add_executable(base sys/aros/dll/dllglue.c ${src_game})
+		add_executable(base ${src_game} sys/aros/aros_dynmodule.cpp sys/aros/aros_dynmodcommon.cpp)
+		target_link_libraries(base idlib dynmodglue)
 		set_target_properties(base PROPERTIES OUTPUT_NAME "base.aros-${AROS_ARCH}")
 	else()
 		add_library(base SHARED ${src_game})
@@ -1385,7 +1384,7 @@ if(BASE AND NOT HARDLINK_GAME)
 	set_target_properties(base PROPERTIES LINK_FLAGS "${ldflags}")
 	set_target_properties(base PROPERTIES INSTALL_NAME_DIR "@executable_path")
 	if (AROS)
-		target_link_libraries(base idlib dll)
+		target_link_libraries(base idlib dynmod)
 	else()
 		target_link_libraries(base idlib)
 	endif()
@@ -1401,7 +1400,8 @@ endif()
 
 if(D3XP AND NOT HARDLINK_GAME)
 	if (AROS)
-		add_executable(d3xp sys/aros/dll/dllglue.c ${src_d3xp})
+		add_executable(d3xp ${src_d3xp} sys/aros/aros_dynmodule.cpp sys/aros/aros_dynmodcommon.cpp)
+		target_link_libraries(d3xp dynmodglue)
 		set_target_properties(d3xp PROPERTIES OUTPUT_NAME "d3xp.aros-${AROS_ARCH}")
 	else()
 		add_library(d3xp SHARED ${src_d3xp})
@@ -1413,7 +1413,7 @@ if(D3XP AND NOT HARDLINK_GAME)
 	set_target_properties(d3xp PROPERTIES LINK_FLAGS "${ldflags}")
 	set_target_properties(d3xp PROPERTIES INSTALL_NAME_DIR "@executable_path")
 	if (AROS)
-		target_link_libraries(d3xp idlib dll)
+		target_link_libraries(d3xp idlib dynmod)
 	else()
 		target_link_libraries(d3xp idlib)
 	endif()

neo/d3xp/MultiplayerGame.cpp

@@ -861,7 +861,7 @@ const char *idMultiplayerGame::GameTime() {
 		t = s / 10;
 		s -= t * 10;
 
-		sprintf( buff, "%i:%i%i", m, t, s );
+		idStr::snPrintf( buff, sizeof( buff ), "%i:%i%i", m, t, s );
 	}
 	return &buff[0];
 }

neo/framework/Common.cpp

@@ -2626,7 +2626,16 @@ Helper for LoadGameDLL() to make it less painful to try different dll names.
 */
 void idCommonLocal::LoadGameDLLbyName( const char *dll, idStr& s ) {
 	s.CapLength(0);
-	// try next to the binary first (build tree)
+	#if defined(__AROS__)
+	// check in the launch (mod) directory first on AROS
+	if (Sys_GetPath(PATH_LAUNCH, s)) {
+		s.AppendPath(dll);
+		gameDLL = sys->DLL_Load(s);
+		if (gameDLL)
+			return;
+	}
+	#endif
+	// try next to the binary
 	if (Sys_GetPath(PATH_EXE, s)) {
 		// "s = " seems superfluous, but works around g++ 4.7 bug else StripFilename()
 		// (and possibly even CapLength()) seems to be "optimized" away and the string contains garbage
@@ -2657,7 +2666,7 @@ void idCommonLocal::LoadGameDLLbyName( const char *dll, idStr& s ) {
 			s.AppendPath(dll);
 			gameDLL = sys->DLL_Load(s);
 		}
-	#else
+	#elif !defined(__AROS__)
 		// then the install folder on *nix
 		if (!gameDLL) {
 			s = BUILD_LIBDIR;

neo/game/MultiplayerGame.cpp

@@ -561,7 +561,7 @@ const char *idMultiplayerGame::GameTime() {
 		s -= t * 10; // => s < 10
 		// writing <= 5 for m + 3 bytes for ":ts" + 1 byte for \0 => 16 bytes is enough
 
-		sprintf( buff, "%i:%i%i", m, t, s );
+		idStr::snPrintf( buff, sizeof( buff ), "%i:%i%i", m, t, s );
 	}
 	return &buff[0];
 }

neo/mmakefile.src

@@ -1,4 +1,4 @@
-# Copyright � 2012-2017, Nick "Kalamatee" Andrews.
+# Copyright � 2012-2025, Nick "Kalamatee" Andrews.
 # $Id$
 
 #
@@ -16,39 +16,50 @@ GRAPHITE_CFLAGS := \
                 -ftree-loop-linear $(CFLAGS_LOOP_STRIP_MINE) $(CFLAGS_LOOP_BLOCK)
 
 NOWARN_FLAGS := $(NOWARN_ERROR) $(NOWARN_MISLEADING_INDENTATION) $(NOWARN_MAYBE_UNINITIALIZED) $(NOWARN_NONNULL_COMPARE) $(NOWARN_ENUM_COMPARE)
+NOWARN_CXXFLAGS := $(NOWARN_CLASS_MEMACCESS)
 
-USER_CFLAGS := $(NOWARN_FLAGS) 
+USER_INCLUDES := -I$(AROS_CONTRIB_INCLUDES)
+USER_CFLAGS := $(NOWARN_FLAGS) $(CPPFLAGS)
 USER_CXXFLAGS := \
-                $(CFLAGS_FAST_MATH) -fomit-frame-pointer -fexceptions $(NOWARN_FLAGS)
-USER_LDFLAGS := -static-libstdc++
+                $(CXXFLAGS_GNU11) $(CFLAGS_FAST_MATH) -fomit-frame-pointer $(CFLAG_EXCEPTIONS) $(NOWARN_FLAGS) $(NOWARN_CXXFLAGS) $(CPPFLAGS)
+USER_LDFLAGS := -L$(AROS_CONTRIB_LIB) -static-libstdc++
 
-#MM- aros-doom3-libs : workbench-libs-jpeg-linklib contrib-openal-linklib development-libogg development-libvorbis
-#MM- aros-doom3-libs : contrib-curl contrib-sdl development-SDL_gfx-quick
+#MM- aros-doom3-libs : workbench-libs-jpeg-linklib contrib-openal development-libogg development-libvorbis
+#MM- aros-doom3-libs : contrib-curl contrib-sdl2 development-SDL2_gfx-quick
 
 #MM aros-doom3 : aros-doom3-libs iconset-Gorilla-contrib-icons-extras-games-adoom3 iconset-Gorilla-contrib-games-doom3game
 
-DOOM3_OPTIONS := -DCORE=ON -DDEDICATED=ON -DBASE=ON -DSDL2=OFF \
+DOOM3_OPTIONS := \
+        -DCORE=ON \
+        -DDEDICATED=ON \
+        -DBASE=ON \
+        -DCMAKE_CXX_STANDARD=11 \
         -DCMAKE_INSTALL_BINDIR= \
         -DCMAKE_INSTALL_LIBDIR= \
-        -DZLIB_LIBRARY=$(AROS_DEVELOPER)/lib/libz.a \
-        -DZLIB_INCLUDE_DIR=$(AROS_DEVELOPER)/include \
-        -DJPEG_LIBRARY=$(AROS_DEVELOPER)/lib/libjpeg.a \
-        -DJPEG_INCLUDE_DIR=$(AROS_DEVELOPER)/include \
-        -DOPENAL_INCLUDE_DIR=$(AROS_DEVELOPER)/include \
-        -DOPENAL_LIBRARY="$(AROS_DEVELOPER)/lib/libopenal.a;$(AROS_DEVELOPER)/lib/libpthread.a;" \
-        -DOGG_LIBRARY=$(AROS_DEVELOPER)/lib/libogg.a \
-        -DOGG_INCLUDE_DIR=$(AROS_DEVELOPER)/include \
-        -DVORBIS_LIBRARY=$(AROS_DEVELOPER)/lib/libvorbis.a \
-        -DVORBIS_INCLUDE_DIR=$(AROS_DEVELOPER)/include \
-        -DVORBISFILE_LIBRARY=$(AROS_DEVELOPER)/lib/libvorbisfile.a \
-        -DVORBISFILE_INCLUDE_DIR=$(AROS_DEVELOPER)/include \
-	-DCURL_LIBRARY="$(AROS_DEVELOPER)/lib/libcurl.a;$(AROS_DEVELOPER)/lib/libiconv.a;$(AROS_DEVELOPER)/lib/libz.a;$(AROS_DEVELOPER)/lib/libssl.a;$(AROS_DEVELOPER)/lib/libcrypto.a;" \
-        -DCURL_INCLUDE_DIR=$(AROS_DEVELOPER)/include \
-        -DSDL_LIBRARY=$(AROS_DEVELOPER)/lib/libSDL.a \
-        -DSDL_INCLUDE_DIR=$(AROS_DEVELOPER)/include/SDL
-
-%build_with_cmake mmake=aros-doom3		\
-    	prefix="$(DOOM3_EXEDIR)"		\
-	extraoptions="$(DOOM3_OPTIONS)"
+        -DOPENAL_INCLUDE_DIR=$(AROS_INCLUDES) \
+        -DOPENAL_LIBRARY="$(AROS_LIB)/libopenal.a" \
+        -DCURL_LIBRARY="$(AROS_LIB)/libcurl.a;$(AROS_CONTRIB_LIB)/libiconv.a;$(AROS_LIB)/libz.a;$(AROS_LIB)/libssl.a;$(AROS_LIB)/libcrypto.a;$(AROS_LIB)/libzstd.a" \
+        -DCURL_INCLUDE_DIR=$(AROS_INCLUDES) \
+        -DSDL2_LIBRARY=$(AROS_LIB)/libSDL2.a \
+        -DSDL2_INCLUDE_DIR=$(AROS_INCLUDES)/SDL2
+
+#DOOM3_OPTIONS += \
+#  -DCMAKE_VERBOSE_MAKEFILE=ON
+
+#    CMAKE_CPP_FLAGS
+#    JPEG_INCLUDE_DIR
+#    JPEG_LIBRARY
+#    OGG_INCLUDE_DIR
+#    OGG_LIBRARY
+#    VORBISFILE_INCLUDE_DIR
+#    VORBISFILE_LIBRARY
+#    VORBIS_INCLUDE_DIR
+#    VORBIS_LIBRARY
+#    ZLIB_INCLUDE_DIR
+#    ZLIB_LIBRARY
+
+%build_with_cmake mmake=aros-doom3                  \
+    prefix="$(DOOM3_EXEDIR)"                        \
+    extraoptions="$(DOOM3_OPTIONS)" usecppflags=no
 
 %common

neo/sys/aros/ADoom3.info.src

@@ -1,2 +1 @@
 TYPE  = TOOL
-STACK = 10000000

neo/sys/aros/ROE

@@ -0,0 +1,4 @@
+ADoom3 +set fs_game d3xp
+If NOT ERROR
+    EndCLI
+EndIf