CMake improvements

CMakeLists.txt

@@ -5,6 +5,14 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
 endif()
 set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release")
 
+if(NOT DEFINED DEDICATED)
+	set(DEDICATED OFF CACHE BOOL "choose client or dedicated server build." FORCE)
+endif()
+
+if (DEDICATED)
+	add_definitions(-DDEDICATED)
+endif()
+
 add_subdirectory(code)
 
 # TODO

code/CMakeLists.txt

@@ -1,11 +1,16 @@
 #add_subdirectory(asm)
 add_subdirectory(botlib)
-add_subdirectory(client)
-add_subdirectory(jpeg-8c)
+
+if (NOT DEDICATED)
+	add_subdirectory(client)
+	add_subdirectory(jpeg-8c)
+	add_subdirectory(renderer)
+	#add_subdirectory(renderer2)
+endif()
+
 add_subdirectory(qcommon)
-add_subdirectory(renderer)
-#add_subdirectory(renderer2)
 add_subdirectory(server)
+
 if(WIN32)
 add_subdirectory(win32)
 else(WIN32)

code/unix/CMakeLists.txt

@@ -1,14 +1,24 @@
-add_executable(quake3e
-	linux_glimp.c
-	linux_joystick.c
-	linux_qgl.c
-	linux_signals.c
-	linux_snd.c
-	unix_main.c
-	unix_shared.c
-	x11_dga.c
-	x11_randr.c
-	x11_vidmode.c
-	)
+if(DEDICATED)
+	add_executable(q3eded
+		linux_signals.c
+		unix_main.c
+		unix_shared.c
+		)
+	target_link_libraries(q3eded botlib qcommon server m dl)
+else()
+	link_directories("/usr/X11R7/lib")
+	add_executable(quake3e
+		linux_signals.c
+		unix_main.c
+		unix_shared.c
+		linux_glimp.c
+		linux_joystick.c
+		linux_qgl.c
+		linux_snd.c
+		x11_dga.c
+		x11_randr.c
+		x11_vidmode.c
+		)
+	target_link_libraries(quake3e botlib client jpeg qcommon renderer server X11 Xext m dl)
+endif()
 
-target_link_libraries(quake3e botlib client jpeg qcommon renderer server X11 Xext m dl)

code/win32/win_wndproc.c

@@ -114,12 +114,11 @@ void WIN_DisableAltTab( void )
 	if ( s_alttab_disabled )
 		return;
 
-#if 0
 	if ( g_wv.hWnd && glw_state.cdsFullscreen ) {
+		// topmost window
 		SetWindowLong( g_wv.hWnd, GWL_EXSTYLE, WINDOW_ESTYLE_FULLSCREEN );
 		SetWindowLong( g_wv.hWnd, GWL_STYLE, WINDOW_STYLE_FULLSCREEN );
 	}
-#endif
 
 	if ( !Q_stricmp( Cvar_VariableString( "arch" ), "winnt" ) )
 		RegisterHotKey( NULL, 0, MOD_ALT, VK_TAB );
@@ -142,13 +141,12 @@ void WIN_EnableAltTab( void )
 	if ( !s_alttab_disabled )
 		return;
 
-#if 0
 	if ( g_wv.hWnd && glw_state.cdsFullscreen ) {
+		// allow moving other windows on foreground
 		SetWindowLong( g_wv.hWnd, GWL_EXSTYLE, WINDOW_ESTYLE_NORMAL );
 		SetWindowLong( g_wv.hWnd, GWL_STYLE, WINDOW_STYLE_FULLSCREEN_MIN );
 		SetWindowPos( g_wv.hWnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE );
 	}
-#endif
 
 	if ( !Q_stricmp( Cvar_VariableString( "arch" ), "winnt" ) )
 		UnregisterHotKey( NULL, 0 );