View | Details | Raw Unified | Return to bug 161561
Collapse All | Expand All

(-)games/el/files/patch-Makefile.linux (-8 / +5 lines)
Lines 25-31 Link Here
25 
 	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_LIBS))
 25 
 	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_LIBS))
26 
 _LDFLAGS=$(XDIR) -lGL -lpthread -lz
 26 
 _LDFLAGS=$(XDIR) -lGL -lpthread -lz
27 
 STATICLIBS=libs/libSDL_net.a libs/libSDL.a libs/libSDL_image.a libs/libopenal.a libs/libvorbisfile.a libs/libvorbis.a libs/libogg.a libs/libxml2.a libs/libcal3d.a libs/libpng.a libs/libasound.a $(EXTRA_STATICLIBS)
 27 
 STATICLIBS=libs/libSDL_net.a libs/libSDL.a libs/libSDL_image.a libs/libopenal.a libs/libvorbisfile.a libs/libvorbis.a libs/libogg.a libs/libxml2.a libs/libcal3d.a libs/libpng.a libs/libasound.a $(EXTRA_STATICLIBS)
28 
@@ -75,16 +77,16 @@
 28 
@@ -75,7 +77,7 @@ HEADER_DIRS = . books eye_candy io pawn
29 
 DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P)) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P))
 29 
 DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P)) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P))
30 
 #(shell echo $OBJ |sed s/\.o/\.P/))
 30 
 #(shell echo $OBJ |sed s/\.o/\.P/))
31
31
Lines 33-48 Link Here
33 
+EXE=el.x86
 33 
+EXE=el.x86
34
34
35 
 ifndef CC
 35 
 ifndef CC
36 
-CC=gcc
 36 
 CC=gcc
37 
+CC?=gcc
 37 
@@ -84,7 +86,7 @@ ifndef CXX
38 
 endif
 38 
 CXX=g++
39 
 ifndef CXX
40 
-CXX=g++
41 
+CXX?=g++
42 
 endif
 39 
 endif
43 
 ifndef LINK
 40 
 ifndef LINK
44 
-LINK=gcc
 41 
-LINK=gcc
45 
+LINK?=gcc
 42 
+LINK?=$(CC)
46 
 endif
 43 
 endif
47
44
48 
 # the compile targets
 45 
 # the compile targets
(-)games/el/files/patch-make.defaults (+10 lines)
Added Link Here
1 
--- make.defaults~
2 
+++ make.defaults
3 
@@ -89,7 +89,3 @@ CXXWARN=-Wall
4 
 #EXTRA_INCLUDES=-IC:\\Programme\\Dev-Cpp\\Include
5 
 #EXTRA_LIBS=-lz
6 
 #EXTRA_STATICLIBS=libs/zlib.a
7 
-
8 
-CC=gcc
9 
-CXX=g++
10 
-LINK=gcc

Return to bug 161561