Revert "Revert "Build in subdirs"", as the issues seem to be ironed out now.

[xonotic/darkplaces.git] / vid_shared.c

diff --git a/vid_shared.c b/vid_shared.c
index 719d6299c4b3c2d2ea696cab14cd6898e6e30f7a..175c75122ecca2130e8a142b9cec15751163cdfe 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -1,6 +1,8 @@
 
 #include "quakedef.h"
 
 #include "quakedef.h"

+#ifdef CONFIG_CD

 #include "cdaudio.h"
 #include "cdaudio.h"

+#endif

 #include "image.h"
 
 #ifdef SUPPORTD3D
 #include "image.h"
 
 #ifdef SUPPORTD3D


@@ -2158,7 +2160,11 @@ void VID_Soft_SharedSetup(void)
        Cvar_SetQuick(&gl_info_driver, gl_driver);
 
        // LordHavoc: report supported extensions
        Cvar_SetQuick(&gl_info_driver, gl_driver);
 
        // LordHavoc: report supported extensions

+#ifdef CONFIG_MENU

        Con_DPrintf("\nQuakeC extensions for server and client: %s\nQuakeC extensions for menu: %s\n", vm_sv_extensions, vm_m_extensions );
        Con_DPrintf("\nQuakeC extensions for server and client: %s\nQuakeC extensions for menu: %s\n", vm_sv_extensions, vm_m_extensions );

+#else
+       Con_DPrintf("\nQuakeC extensions for server and client: %s\n", vm_sv_extensions );
+#endif

 
        // clear to black (loading plaque will be seen over this)
        GL_Clear(GL_COLOR_BUFFER_BIT, NULL, 1.0f, 128);
 
        // clear to black (loading plaque will be seen over this)
        GL_Clear(GL_COLOR_BUFFER_BIT, NULL, 1.0f, 128);