]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
only apply the CFLAGS_CRYPTO to the crypto compile; helps in the Xonotic build system
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 15 Oct 2010 14:23:12 +0000 (14:23 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 15 Oct 2010 14:24:15 +0000 (16:24 +0200)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10535 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=92019048fd93cf79e5a71bd8fdea80cb68f4fcdd

makefile.inc

index 7341be977d09748f966cf0948acb1c7f04030b7d..3e8e6baf658eb4aa846f400a3fb43bee0c20e40c 100644 (file)
@@ -190,7 +190,7 @@ OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o $(OBJ_SND_COMMON) snd_sdl.o cd_sdl.o $(
 
 
 # Compilation
-CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_CG) $(CFLAGS_WARNINGS) $(CFLAGS_LIBJPEG) $(CFLAGS_D3D) $(CFLAGS_CRYPTO)
+CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_CG) $(CFLAGS_WARNINGS) $(CFLAGS_LIBJPEG) $(CFLAGS_D3D)
 CFLAGS_DEBUG=-ggdb
 CFLAGS_PROFILE=-g -pg -ggdb -fprofile-arcs
 CFLAGS_RELEASE=
@@ -524,6 +524,10 @@ cd_sdl.o: cd_sdl.c
        $(CHECKLEVEL2)
        $(DO_CC) $(CFLAGS_SDL)
 
+crypto.o: crypto.c
+       $(CHECKLEVEL2)
+       $(DO_CC) $(CFLAGS_CRYPTO) $(CFLAGS_CRYPTO_RIJNDAEL)
+
 mod_skeletal_animatevertices_sse.o: mod_skeletal_animatevertices_sse.c
        $(CHECKLEVEL2)
        $(DO_CC) $(CFLAGS_SSE)