From bf8b294d4660bab7c0fc3ec034333ad6bbc8ccd5 Mon Sep 17 00:00:00 2001 From: sago007 Date: Tue, 6 Feb 2018 19:40:49 +0100 Subject: [PATCH] Use curl by default. Use Makefile.local to diable it if you need --- Makefile.OpenArena | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/Makefile.OpenArena b/Makefile.OpenArena index bbc72a6c..58376bd5 100644 --- a/Makefile.OpenArena +++ b/Makefile.OpenArena @@ -2,7 +2,7 @@ # Create a Makefile.local which is ignored by git for your local overrides # that you don't want committed to git. -USE_GIT =0 +USE_GIT =0 # Defaults for OpenArena. You shouldn't need to modify this section # This is only the client/server engine so we don't build the QVM here. BUILD_STANDALONE=1 @@ -28,17 +28,14 @@ endif OPTIMIZE += -flto -# Can't use CURL on my system atm -ifndef USE_CURL -USE_CURL=0 -endif - # This doesn't work with OpenArena yet BUILD_RENDERER_OPENGL2=0 # You can disable the renderer libraries and build in the OA renderer by default USE_RENDERER_DLOPEN=0 +ifndef USE_CONSOLE_WINDOW USE_CONSOLE_WINDOW=1 # use an early console window (WIN32 only) +endif # renderer_oa - This causes compiling issues on Linux and does not work yet. USE_FALLBACK_GLSL=0 @@ -58,15 +55,6 @@ CLIENTBIN=openarena SERVERBIN=oa_ded COPYDIR=/usr/local/games/openarena -# Cross compiling: 64-bit Windows -# PLATFORM=mingw32 -# ARCH=x86_64 -# USE_CODEC_VORBIS=0 -# -# Cross compiling: 32-bit Windows -# PLATFORM=mingw32 -# ARCH=x86 -# USE_CODEC_VORBIS=0 # DEBUG_CFLAGS=-ggdb -O0