| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 6aad913ddd5cdb473db9fa21a5e8ecec58de172b Mon Sep 17 00:00:00 2001 |
| 2 | From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408> |
| 3 | Date: Wed, 12 Jan 2011 04:41:02 +0000 |
| 4 | Subject: [PATCH 3/8] Fix build failure with ld --as-needed. |
| 5 | |
| 6 | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> |
| 7 | |
| 8 | git-svn-id: svn://svn.berlios.de/slim/trunk@177 7c53e7cc-98ea-0310-8f1f-a0b24da60408 |
| 9 | --- |
| 10 | Makefile | 4 ++-- |
| 11 | 1 files changed, 2 insertions(+), 2 deletions(-) |
| 12 | |
| 13 | diff --git a/Makefile b/Makefile |
| 14 | index 1219de4..fafa0ef 100644 |
| 15 | --- a/Makefile |
| 16 | +++ b/Makefile |
| 17 | @@ -4,7 +4,7 @@ |
| 18 | # to fit into your operating system / distribution |
| 19 | ####################################################### |
| 20 | CXX=/usr/bin/g++ |
| 21 | -CC=/usr/bin/gcc |
| 22 | +CC=/usr/bin/gcc-4.5 |
| 23 | CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include |
| 24 | CXXFLAGS=$(CFLAGS) |
| 25 | LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt |
| 26 | @@ -33,7 +33,7 @@ endif |
| 27 | all: slim |
| 28 | |
| 29 | slim: $(OBJECTS) |
| 30 | - $(CXX) $(LDFLAGS) $(OBJECTS) -o $(NAME) |
| 31 | + $(CXX) $(OBJECTS) $(LDFLAGS) -o $(NAME) |
| 32 | |
| 33 | .cpp.o: |
| 34 | $(CXX) $(CXXFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@ |
| 35 | -- |
| 36 | 1.6.6.1 |
| 37 | |