File 0005-build-with-system-curl.diff of Package enemy-territory

Overview Repositories Revisions Requests Users Attributes Meta

File 0005-build-with-system-curl.diff of Package enemy-territory

From b5a752ebd0f2c8c47f6b40c2c655d267b20a907b Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Fri, 13 Aug 2010 15:57:42 +0200
Subject: [PATCH 5/7] build with system curl

---
 src/SConscript.core        |    5 +----
 src/SConstruct             |   15 +--------------
 src/qcommon/dl_main_curl.c |    4 ----
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/SConscript.core b/src/SConscript.core
index abe47d4..24bfd42 100644
--- a/src/SConscript.core
+++ b/src/SConscript.core
@@ -263,9 +263,8 @@ local_env = g_env.Clone()
 if ( g_os == 'Linux' ):
 	local_env.Append( LIBS = [ 'dl' ] )
 	if ( local_dedicated == 0 ):
-		local_env.Append( LIBS = [ 'X11', 'Xext', 'Xxf86dga', 'Xxf86vm', 'm' ] )
+		local_env.Append( LIBS = [ 'X11', 'Xext', 'Xxf86dga', 'Xxf86vm', 'curl', 'm' ] )
 		local_env.Append( LIBPATH = [ '/usr/X11R6/lib' ] )
-		local_env.Append( CPPPATH = [ 'curl-7.12.2/include' ] )
 	else:
 		local_env.Append( CPPDEFINES = [ 'DEDICATED' ] )
 		local_env.Append( LIBS = [ 'm' ] )
@@ -279,7 +278,6 @@ elif ( g_os == 'win32' ):
 	local_env.Append( LIBS = [ 'm', 'winmm', 'wsock32', 'gdi32', 'ole32', 'iphlpapi' ] )
 	if ( local_dedicated == 0 ):
 		local_env.Append( LIBS = [ 'dinput', 'dsound' ] )
-		local_env.Append( CPPPATH = [ 'curl-7.12.2/include' ] )
 	else:
 		local_env.Append( CPPDEFINES = [ 'DEDICATED' ] )
 	local_env['LINK'] = g_env['CXX']
@@ -315,7 +313,6 @@ if ( local_dedicated == 0 ):
 	source_list += renderer_list
 	source_list += client_list
 	source_list += [ 'qcommon/dl_main_curl.c' ]
-	source_list += curl_lib
 	if ( g_os == 'Linux' ):
 		if cpu == 'x86':
 			source_list += snd_mixa
diff --git a/src/SConstruct b/src/SConstruct
index 125676f..10a350c 100644
--- a/src/SConstruct
+++ b/src/SConstruct
@@ -295,11 +295,8 @@ if ( int(JOBS) > 1 ):
 # mark the globals
 
 local_dedicated = 0
-# curl
-local_curl = 0	# config selection
-curl_lib = []
 
-GLOBALS = 'g_env OS g_os BUILD local_dedicated curl_lib local_curl MASTER gcc3 cpu'
+GLOBALS = 'g_env OS g_os BUILD local_dedicated MASTER gcc3 cpu'
 
 # end general configuration ----------------------
 
@@ -322,16 +319,6 @@ if g_os == 'win32' and os.name != 'nt':
 
 toplevel_targets = []
 
-# build curl if needed
-if ( TARGET_CORE == '1' and DEDICATED != '1' and OS != 'Darwin' ):
-	# 1: debug, 2: release
-	if ( BUILD == 'release' ):
-		local_curl = 2
-	else:
-		local_curl = 1
-	Export( 'GLOBALS ' + GLOBALS )
-	curl_lib = SConscript( 'SConscript.curl' )
-
 if ( TARGET_CORE == '1' ):
 	if ( DEDICATED == '0' or DEDICATED == '2' ):
 		local_dedicated = 0
diff --git a/src/qcommon/dl_main_curl.c b/src/qcommon/dl_main_curl.c
index 2138f83..3c38ff1 100644
--- a/src/qcommon/dl_main_curl.c
+++ b/src/qcommon/dl_main_curl.c
@@ -32,11 +32,7 @@ If you have questions concerning this license or the applicable additional terms
 	* Add server as referring URL
 */
 
-#ifdef __MACOS__
 #include <curl/curl.h>
-#else
-#include "../curl-7.12.2/include/curl/curl.h"
-#endif
 
 #include "../game/q_shared.h"
 #include "qcommon.h"
-- 
1.6.4.2

Places

File 0005-build-with-system-curl.diff of Package enemy-territory

Places