Leak_Technologies/HULL
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove architecture from binary filenames

Browse Source
This commit is contained in:
Tim Angus 2025-08-21 22:22:58 +01:00
parent 92e9ddf02b
commit 8dfedc60c1
12 changed files with 18 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -13,7 +13,6 @@ option(BUILD_GAME_LIBRARIES "Build game module libraries" ON)
option(BUILD_GAME_QVMS "Build game module qvms" ON)
option(BUILD_STANDALONE "Build binaries for standalone games" OFF)
option(USE_ARCHLESS_FILENAMES "Don't include the architecture in binary filenames" OFF)
option(USE_RENDERER_DLOPEN "Dynamically load the renderer(s)" ON)
option(USE_OPENAL "OpenAL audio" ON)
option(USE_OPENAL_DLOPEN "Dynamically load OpenAL" ON)

34
Makefile
View File

@ -243,10 +243,6 @@ ifndef USE_RENDERER_DLOPEN
USE_RENDERER_DLOPEN=1
endif
ifndef USE_ARCHLESS_FILENAMES
USE_ARCHLESS_FILENAMES=0
endif
ifndef USE_YACC
USE_YACC=0
endif
@ -1067,21 +1063,11 @@ endif
TARGETS =
ifndef FULLBINEXT
ifeq ($(USE_ARCHLESS_FILENAMES),1)
FULLBINEXT=$(BINEXT)
else
FULLBINEXT=.$(ARCH)$(BINEXT)
endif
FULLBINEXT=$(BINEXT)
endif
ifndef SHLIBNAME
ifeq ($(USE_ARCHLESS_FILENAMES),1)
SHLIBNAME=.$(SHLIBEXT)
RSHLIBNAME=$(SHLIBNAME)
else
SHLIBNAME=$(ARCH).$(SHLIBEXT)
RSHLIBNAME=_$(SHLIBNAME)
endif
SHLIBNAME=.$(SHLIBEXT)
endif
ifneq ($(BUILD_SERVER),0)
@ -1093,10 +1079,10 @@ ifneq ($(BUILD_CLIENT),0)
TARGETS += $(B)/$(CLIENTBIN)$(FULLBINEXT)
ifneq ($(BUILD_RENDERER_OPENGL1),0)
TARGETS += $(B)/renderer_opengl1$(RSHLIBNAME)
TARGETS += $(B)/renderer_opengl1$(SHLIBNAME)
endif
ifneq ($(BUILD_RENDERER_OPENGL2),0)
TARGETS += $(B)/renderer_opengl2$(RSHLIBNAME)
TARGETS += $(B)/renderer_opengl2$(SHLIBNAME)
endif
else
ifneq ($(BUILD_RENDERER_OPENGL1),0)
@ -1318,10 +1304,6 @@ ifeq ($(BUILD_STANDALONE),1)
BASE_CFLAGS += -DSTANDALONE
endif
ifeq ($(USE_ARCHLESS_FILENAMES),1)
BASE_CFLAGS += -DUSE_ARCHLESS_FILENAMES
endif
ifeq ($(GENERATE_DEPENDENCIES),1)
DEPEND_CFLAGS = -MMD
else
@ -2418,12 +2400,12 @@ $(B)/$(CLIENTBIN)$(FULLBINEXT): $(Q3OBJ) $(LIBSDLMAIN)
-o $@ $(Q3OBJ) \
$(LIBSDLMAIN) $(CLIENT_LIBS) $(LIBS)
$(B)/renderer_opengl1$(RSHLIBNAME): $(Q3ROBJ) $(JPGOBJ)
$(B)/renderer_opengl1$(SHLIBNAME): $(Q3ROBJ) $(JPGOBJ)
$(echo_cmd) "LD $@"
$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3ROBJ) $(JPGOBJ) \
$(THREAD_LIBS) $(LIBSDLMAIN) $(RENDERER_LIBS) $(LIBS)
$(B)/renderer_opengl2$(RSHLIBNAME): $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ)
$(B)/renderer_opengl2$(SHLIBNAME): $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ)
$(echo_cmd) "LD $@"
$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) \
$(THREAD_LIBS) $(LIBSDLMAIN) $(RENDERER_LIBS) $(LIBS)
@ -3147,10 +3129,10 @@ ifneq ($(BUILD_CLIENT),0)
ifneq ($(USE_RENDERER_DLOPEN),0)
$(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(CLIENTBIN)$(FULLBINEXT) $(COPYBINDIR)/$(CLIENTBIN)$(FULLBINEXT)
ifneq ($(BUILD_RENDERER_OPENGL1),0)
$(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/renderer_opengl1$(RSHLIBNAME) $(COPYBINDIR)/renderer_opengl1$(RSHLIBNAME)
$(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/renderer_opengl1$(SHLIBNAME) $(COPYBINDIR)/renderer_opengl1$(SHLIBNAME)
endif
ifneq ($(BUILD_RENDERER_OPENGL2),0)
$(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/renderer_opengl2$(RSHLIBNAME) $(COPYBINDIR)/renderer_opengl2$(RSHLIBNAME)
$(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/renderer_opengl2$(SHLIBNAME) $(COPYBINDIR)/renderer_opengl2$(SHLIBNAME)
endif
else
ifneq ($(BUILD_RENDERER_OPENGL1),0)

1
README.md
View File

@ -147,7 +147,6 @@ The following CMake variables may be set, using `-D` on the command line.
BUILD_GAME_QVMS - build the game qvms
BUILD_STANDALONE - build binaries suited for stand-alone games
USE_ARCHLESS_FILENAMES - don't include the architecture in binary filenames
USE_RENDERER_DLOPEN - build and use the renderer in a library
USE_OPENAL - use OpenAL where available
USE_OPENAL_DLOPEN - link with OpenAL at runtime

13
cmake/basegame.cmake
View File

@ -2,7 +2,6 @@ if(NOT BUILD_GAME_LIBRARIES AND NOT BUILD_GAME_QVMS)
return()
endif()
include(utils/arch)
include(utils/qvm_tools)
include(utils/set_output_dirs)
@ -129,15 +128,9 @@ set(GAME_SOURCES_BASEGAME ${GAME_SOURCES} ${GAME_MODULE_SHARED_SOURCES})
set(UI_SOURCES_BASEGAME ${UI_SOURCES} ${GAME_MODULE_SHARED_SOURCES})
if(BUILD_GAME_LIBRARIES)
if(USE_ARCHLESS_FILENAMES)
set(CGAME_MODULE_BINARY ${CGAME_MODULE})
set(GAME_MODULE_BINARY ${GAME_MODULE})
set(UI_MODULE_BINARY ${UI_MODULE})
else()
set(CGAME_MODULE_BINARY ${CGAME_MODULE}${ARCH})
set(GAME_MODULE_BINARY ${GAME_MODULE}${ARCH})
set(UI_MODULE_BINARY ${UI_MODULE}${ARCH})
endif()
set(CGAME_MODULE_BINARY ${CGAME_MODULE})
set(GAME_MODULE_BINARY ${GAME_MODULE})
set(UI_MODULE_BINARY ${UI_MODULE})
set(CGAME_MODULE_BINARY_BASEGAME ${CGAME_MODULE_BINARY}_${BASEGAME})
set(GAME_MODULE_BINARY_BASEGAME ${GAME_MODULE_BINARY}_${BASEGAME})

8
cmake/client.cmake
View File

@ -3,7 +3,6 @@ if(NOT BUILD_CLIENT)
endif()
include(utils/add_git_dependency)
include(utils/arch)
include(utils/set_output_dirs)
include(shared_sources)
@ -42,12 +41,7 @@ set(CLIENT_SOURCES
add_git_dependency(${SOURCE_DIR}/client/cl_console.c)
if(USE_ARCHLESS_FILENAMES)
set(CLIENT_BINARY ${CLIENT_NAME})
list(APPEND CLIENT_DEFINITIONS USE_ARCHLESS_FILENAMES)
else()
set(CLIENT_BINARY ${CLIENT_NAME}.${ARCH})
endif()
set(CLIENT_BINARY ${CLIENT_NAME})
list(APPEND CLIENT_DEFINITIONS BOTLIB)

4
cmake/platforms/macos.cmake
View File

@ -4,10 +4,6 @@ if(NOT APPLE)
return()
endif()
# Including the arch in the filename doesn't really make sense
# on macOS where we're building Universal Binaries
set(USE_ARCHLESS_FILENAMES ON CACHE INTERNAL "")
option(BUILD_MACOS_APP "Deploy as a macOS .app" ON)
enable_language(OBJC)

9
cmake/renderer_gl1.cmake
View File

@ -2,7 +2,6 @@ if(NOT BUILD_CLIENT OR NOT BUILD_RENDERER_GL1)
return()
endif()
include(utils/arch)
include(utils/set_output_dirs)
include(renderer_common)
@ -33,13 +32,7 @@ set(RENDERER_GL1_SOURCES
)
set(RENDERER_GL1_BASENAME renderer_opengl1)
if(USE_ARCHLESS_FILENAMES)
set(RENDERER_GL1_BINARY ${RENDERER_GL1_BASENAME})
list(APPEND RENDERER_DEFINITIONS USE_ARCHLESS_FILENAMES)
else()
set(RENDERER_GL1_BINARY ${RENDERER_GL1_BASENAME}_${ARCH})
endif()
set(RENDERER_GL1_BINARY ${RENDERER_GL1_BASENAME})
list(APPEND RENDERER_GL1_BINARY_SOURCES
${RENDERER_COMMON_SOURCES}

9
cmake/renderer_gl2.cmake
View File

@ -2,7 +2,6 @@ if(NOT BUILD_CLIENT OR NOT BUILD_RENDERER_GL2)
return()
endif()
include(utils/arch)
include(utils/set_output_dirs)
include(renderer_common)
@ -64,13 +63,7 @@ foreach(SHADER_FILE IN LISTS RENDERER_GL2_SHADER_SOURCES)
endforeach()
set(RENDERER_GL2_BASENAME renderer_opengl2)
if(USE_ARCHLESS_FILENAMES)
set(RENDERER_GL2_BINARY ${RENDERER_GL2_BASENAME})
list(APPEND RENDERER_DEFINITIONS USE_ARCHLESS_FILENAMES)
else()
set(RENDERER_GL2_BINARY ${RENDERER_GL2_BASENAME}_${ARCH})
endif()
set(RENDERER_GL2_BINARY ${RENDERER_GL2_BASENAME})
list(APPEND RENDERER_GL2_BINARY_SOURCES
${RENDERER_COMMON_SOURCES}

7
cmake/server.cmake
View File

@ -12,12 +12,7 @@ set(NULL_SOURCES
${SOURCE_DIR}/null/null_snddma.c
)
if(USE_ARCHLESS_FILENAMES)
set(SERVER_BINARY ${SERVER_NAME})
list(APPEND SERVER_DEFINITIONS USE_ARCHLESS_FILENAMES)
else()
set(SERVER_BINARY ${SERVER_NAME}.${ARCH})
endif()
set(SERVER_BINARY ${SERVER_NAME})
list(APPEND SERVER_DEFINITIONS DEDICATED)
list(APPEND SERVER_DEFINITIONS BOTLIB)

10
code/client/cl_main.c
View File

@ -3250,12 +3250,6 @@ void CL_InitRef( void ) {
#ifdef USE_RENDERER_DLOPEN
GetRefAPI_t GetRefAPI;
char dllName[MAX_OSPATH];
#ifdef USE_ARCHLESS_FILENAMES
#define RENDERER_ARCH_DLL_EXT ARCH_DLL_EXT
#else
#define RENDERER_ARCH_DLL_EXT "_" ARCH_DLL_EXT
#endif
#endif
Com_Printf( "----- Initializing Renderer ----\n" );
@ -3263,14 +3257,14 @@ void CL_InitRef( void ) {
#ifdef USE_RENDERER_DLOPEN
cl_renderer = Cvar_Get("cl_renderer", "opengl2", CVAR_ARCHIVE | CVAR_LATCH);
Com_sprintf(dllName, sizeof(dllName), "renderer_%s" RENDERER_ARCH_DLL_EXT, cl_renderer->string);
Com_sprintf(dllName, sizeof(dllName), "renderer_%s" DLL_EXT, cl_renderer->string);
if(!(rendererLib = Sys_LoadDll(dllName, qfalse)) && strcmp(cl_renderer->string, cl_renderer->resetString))
{
Com_Printf("failed:\n\"%s\"\n", Sys_LibraryError());
Cvar_ForceReset("cl_renderer");
Com_sprintf(dllName, sizeof(dllName), "renderer_%s" RENDERER_ARCH_DLL_EXT, cl_renderer->resetString);
Com_sprintf(dllName, sizeof(dllName), "renderer_%s" DLL_EXT, cl_renderer->resetString);
rendererLib = Sys_LoadDll(dllName, qfalse);
}

2
code/qcommon/files.c
View File

@ -1456,7 +1456,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, i
Com_Error(ERR_FATAL, "Filesystem call made without initialization");
if(enableDll)
Com_sprintf(dllName, sizeof(dllName), "%s" ARCH_DLL_EXT, name);
Com_sprintf(dllName, sizeof(dllName), "%s" DLL_EXT, name);
Com_sprintf(qvmName, sizeof(qvmName), "vm/%s.qvm", name);

6
code/qcommon/q_platform.h
View File

@ -410,10 +410,4 @@ float FloatSwap (const float *f);
#define PLATFORM_STRING OS_STRING "-" ARCH_STRING "-debug"
#endif
#ifdef USE_ARCHLESS_FILENAMES
#define ARCH_DLL_EXT DLL_EXT
#else
#define ARCH_DLL_EXT ARCH_STRING DLL_EXT
#endif
#endif