From: sirakaba <sirakaba@9df91469-1e22-0410-86e7-ea8537beb833>
Date: Sat, 30 Oct 2010 11:06:38 +0000 (+0000)
Subject: MinGWでのリンクエラーを修正。
X-Git-Tag: 0.01beta9~48
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3ce5d090f26d61f3c9f45212057c323a6d279a42;hp=c642209abbe0eea8a0ad6ec048aa0034ffa5e6d9;p=tpi%2Flychee.git

MinGWでのリンクエラーを修正。

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@396 9df91469-1e22-0410-86e7-ea8537beb833
---

diff --git a/src/common/Makefile.default b/src/common/Makefile.default
index adac667..71bb5d9 100644
--- a/src/common/Makefile.default
+++ b/src/common/Makefile.default
@@ -4,14 +4,14 @@
 # Define compilers.
 CC = g++
 CPPFLAGS = -c -O3 -Wall -Wextra `wx-config --cxxflags`
-LDFLAGS  = -s `wx-config --libs`
+LDFLAGS  = -s
 
 .PHONY: all clean
 .SUFFIXES: .cpp .o
 
 all: $(DIR_OBJ) $(addprefix $(DIR_OBJ)/,$(OBJS)) $(IN_ADD)
 ifdef OUT_EXE
-	$(CC) $(LDFLAGS) -o $(OUT_EXE) $(addprefix $(DIR_OBJ)/,$(OBJS))
+	$(CC) $(LDFLAGS) -o $(OUT_EXE) $(addprefix $(DIR_OBJ)/,$(OBJS)) `wx-config --libs`
 endif
 
 clean:
diff --git a/src/plugin/Makefile.default b/src/plugin/Makefile.default
index 84fe0d2..9e13689 100644
--- a/src/plugin/Makefile.default
+++ b/src/plugin/Makefile.default
@@ -4,7 +4,7 @@
 # Define compilers.
 CC = g++
 CPPFLAGS = -c -O3 -Wall -Wextra -fPIC `wx-config --cxxflags` $(CPPFLAGS_ADD)
-LDFLAGS  = -s -shared -Wl,-Bsymbolic `wx-config --libs`
+LDFLAGS  = -s -shared -Wl,-Bsymbolic
 
 # Define i/o files.
 DIR_OBJ  = ../../tmp/$(PLUGIN_NAME)
@@ -21,7 +21,7 @@ OUT_LIB  = ../../../bin/lib/$(PLUGIN_NAME).so
 .SUFFIXES: .cpp .o
 
 all: $(DIR_OBJ) $(addprefix $(DIR_OBJ)/,$(OBJS) $(OBJS_ADD))
-	$(CC) $(LDFLAGS) -o $(OUT_LIB) -L$(dir $(OUT_LIB)) -Wl,-soname,$(notdir $(OUT_LIB)) $(addprefix $(DIR_OBJ)/,$(OBJS) $(OBJS_ADD))
+	$(CC) $(LDFLAGS) -o $(OUT_LIB) -L$(dir $(OUT_LIB)) -Wl,-soname,$(notdir $(OUT_LIB)) $(addprefix $(DIR_OBJ)/,$(OBJS) $(OBJS_ADD)) `wx-config --libs`
 	chcon -t textrel_shlib_t $(OUT_LIB)
 
 clean: