Explicitly initialize openssl for older curl versions

[xonotic/darkplaces.git] / makefile.inc

diff --git a/makefile.inc b/makefile.inc
index 22e960afa054332ecabff023280ed110b4812607..2567612543e010e2aba67c906602f4de789a7e75 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -37,9 +37,9 @@ SDLCONFIG_UNIXLIBS?=`$(SDL_CONFIG) --libs`
 SDLCONFIG_UNIXLIBS_X11?=-lX11
 SDLCONFIG_UNIXSTATICLIBS?=`$(SDL_CONFIG) --static-libs`
 SDLCONFIG_UNIXSTATICLIBS_X11?=-lX11
-SDLCONFIG_MACOSXCFLAGS=-I/Library/Frameworks/SDL2.framework/Headers -I$(HOME)/Library/Frameworks/SDL2.framework/Headers
-SDLCONFIG_MACOSXLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL2 -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS)
-SDLCONFIG_MACOSXSTATICLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL2 -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS)
+SDLCONFIG_MACOSXCFLAGS=$(SDLCONFIG_UNIXCFLAGS)
+SDLCONFIG_MACOSXLIBS=$(SDLCONFIG_UNIXLIBS)
+SDLCONFIG_MACOSXSTATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
 STRIP?=strip
 
 
@@ -51,27 +51,6 @@ OBJ_SND_COMMON=snd_main.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o $(OBJ_SND_XMP)
 OBJ_SND_NULL=snd_null.o
 LIB_SND_NULL=
 
-# Open Sound System (Linux, FreeBSD and Solaris)
-OBJ_SND_OSS=$(OBJ_SND_COMMON) snd_oss.o
-LIB_SND_OSS=
-
-# Advanced Linux Sound Architecture (Linux)
-OBJ_SND_ALSA=$(OBJ_SND_COMMON) snd_alsa.o
-LIB_SND_ALSA=-lasound
-
-# Core Audio (Mac OS X)
-OBJ_SND_COREAUDIO=$(OBJ_SND_COMMON) snd_coreaudio.o
-LIB_SND_COREAUDIO=-framework CoreAudio
-
-# BSD / Sun audio API (NetBSD and OpenBSD)
-OBJ_SND_BSD=$(OBJ_SND_COMMON) snd_bsd.o
-LIB_SND_BSD=
-
-# DirectX and Win32 WAVE output (Win32)
-OBJ_SND_WIN=$(OBJ_SND_COMMON) snd_win.o
-LIB_SND_WIN=
-
-
 ###### Common objects and flags #####
 
 # Common objects
@@ -101,7 +80,7 @@ OBJ_COMMON= \
        com_ents.o \
        com_ents4.o \
        com_game.o \
-       com_list.o \
+       com_infostring.o \
        com_msg.o \
        common.o \
        console.o \
@@ -151,6 +130,7 @@ OBJ_COMMON= \
        r_shadow.o \
        r_sky.o \
        r_sprites.o \
+       r_stats.o \
        sbar.o \
        sv_ccmds.o \
        sv_demo.o \
@@ -263,7 +243,7 @@ LDFLAGS_LINUXSDL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl $(LDFLAGS_UNIXSDL)
 
 # Link
 LDFLAGS_MACOSXSV=$(LDFLAGS_UNIXCOMMON) -ldl
-LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit $(SDLCONFIG_STATICLIBS) ../../../SDLMain.m
+LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit $(SDLCONFIG_STATICLIBS) #../../../SDLMain.m
 
 
 ##### SunOS specific variables #####
@@ -448,21 +428,29 @@ prepare :
 
 
 #this checks USEODE when compiling so it needs the ODE flags as well
-prvm_cmds.o: prvm_cmds.c
+cl_parse.o: cl_parse.c
        $(CHECKLEVEL2)
        $(DO_CC) $(CFLAGS_ODE)
 
-world.o: world.c
+cs_progs.o: cs_progs.c
+       $(CHECKLEVEL2)
+       $(DO_CC) $(CFLAGS_ODE)
+
+sv_main.o: sv_main.c
        $(CHECKLEVEL2)
        $(DO_CC) $(CFLAGS_ODE)
 
-vid_glx.o: vid_glx.c
+sv_phys.o: sv_phys.c
        $(CHECKLEVEL2)
-       $(DO_CC) -I/usr/X11R6/include
+       $(DO_CC) $(CFLAGS_ODE)
 
-keysym2ucs.o: keysym2ucs.c
+prvm_cmds.o: prvm_cmds.c
        $(CHECKLEVEL2)
-       $(DO_CC) -I/usr/X11R6/include
+       $(DO_CC) $(CFLAGS_ODE)
+
+world.o: world.c
+       $(CHECKLEVEL2)
+       $(DO_CC) $(CFLAGS_ODE)
 
 crypto.o: crypto.c
        $(CHECKLEVEL2)