| 1 |
mr_bones_ 08/09/01 20:19:28 |
| 2 |
|
| 3 |
Added: widelands-0.0.12-build.patch |
| 4 |
Removed: widelands-0.0.11-build.patch |
| 5 |
Log: |
| 6 |
use version-correct patch; clean old files |
| 7 |
(Portage version: 2.1.4.4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-strategy/widelands/files/widelands-0.0.12-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/widelands/files/widelands-0.0.12-build.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/widelands/files/widelands-0.0.12-build.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: widelands-0.0.12-build.patch |
| 16 |
=================================================================== |
| 17 |
--- Makefile |
| 18 |
+++ Makefile |
| 19 |
@@ -26,7 +26,7 @@ |
| 20 |
|
| 21 |
#most current glibc systems implicitly contain libintl.so |
| 22 |
ifndef IMPLICIT_LIBINTL |
| 23 |
-IMPLICIT_LIBINTL:=NO |
| 24 |
+IMPLICIT_LIBINTL:=YES |
| 25 |
endif |
| 26 |
|
| 27 |
# Is this a cross compile? |
| 28 |
@@ -64,7 +64,7 @@ |
| 29 |
# profile optimized, debugging symbols, profiling |
| 30 |
# |
| 31 |
ifndef BUILD |
| 32 |
-BUILD:=debug |
| 33 |
+BUILD:=release |
| 34 |
endif |
| 35 |
|
| 36 |
endif |
| 37 |
@@ -108,11 +108,9 @@ |
| 38 |
BUILD:=$(strip $(BUILD)) |
| 39 |
|
| 40 |
ifeq ($(BUILD),release) |
| 41 |
-OPTIMIZE:=yes |
| 42 |
# heavy optimization |
| 43 |
#ADD_CFLAGS:=$(ADD_CFLAGS) -fomit-frame-pointer -finline-functions -ffast-math -funroll-loops -funroll-all-loops -fexpensive-optimizations |
| 44 |
# !!!! -fomit-frame-pointer breaks execeptions !!!! |
| 45 |
-ADD_CFLAGS:=$(ADD_CFLAGS) -finline-functions -ffast-math -funroll-loops -funroll-all-loops -fexpensive-optimizations |
| 46 |
else |
| 47 |
ifeq ($(BUILD),profile) |
| 48 |
OPTIMIZE:=yes |
| 49 |
@@ -151,9 +149,8 @@ |
| 50 |
# Object files and directories, final compilation flags |
| 51 |
|
| 52 |
OBJECT_DIR:=src/$(TARGET)-$(BUILD) |
| 53 |
-CFLAGS:=-Wall $(shell $(SDL_CONFIG) --cflags) $(ADD_CFLAGS) |
| 54 |
-CXXFLAGS:=$(CFLAGS) |
| 55 |
-LDFLAGS:=$(shell $(SDL_CONFIG) --libs) $(ADD_LDFLAGS) -lz -lpng -lSDL_image -lSDL_mixer -lSDL_ttf -lSDL_net -lSDL_gfx |
| 56 |
+CXXFLAGS+=-Wall $(shell $(SDL_CONFIG) --cflags) $(ADD_CFLAGS) |
| 57 |
+LDFLAGS+=$(shell $(SDL_CONFIG) --libs) $(ADD_LDFLAGS) -lz -lpng -lSDL_image -lSDL_mixer -lSDL_ttf -lSDL_net -lSDL_gfx |
| 58 |
|
| 59 |
############################################################################## |
| 60 |
# Building |
| 61 |
@@ -208,13 +205,13 @@ |
| 62 |
|
| 63 |
$(OBJECT_DIR)/widelands: $(OBJ) |
| 64 |
@echo "===> LD $@" |
| 65 |
- $(Q)$(CXX) $(OBJ) -o $@ $(LDFLAGS) $(CFLAGS) |
| 66 |
+ $(CXX) $(OBJ) -o $@ $(LDFLAGS) $(CXXFLAGS) |
| 67 |
|
| 68 |
-include $(DEP) |
| 69 |
|
| 70 |
$(OBJECT_DIR)/%.o: src/%.cc src/build_id.h src/config.h |
| 71 |
@echo "===> CXX $<" |
| 72 |
- $(Q)$(CXX) -pipe $(CXXFLAGS) -MMD -MP -MF $@.d -c -o $@ $< |
| 73 |
+ $(CXX) $(CXXFLAGS) -MMD -MP -MF $@.d -c -o $@ $< |
| 74 |
$(Q)sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' $@.d > $(OBJECT_DIR)/$*.d |
| 75 |
$(Q)rm $@.d |
Archives