Remove architecture from binary filenames

code/client/cl_main.c

@@ -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);
 	}
 

code/qcommon/files.c

@@ -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);
 

code/qcommon/q_platform.h

@@ -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