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 (file)
--- a/src/common/Makefile.default
+++ b/src/common/Makefile.default
@@ -4,14 +4,14 @@
 # Define compilers.\r
 CC = g++\r
 CPPFLAGS = -c -O3 -Wall -Wextra `wx-config --cxxflags`\r
-LDFLAGS  = -s `wx-config --libs`\r
+LDFLAGS  = -s\r
 \r
 .PHONY: all clean\r
 .SUFFIXES: .cpp .o\r
 \r
 all: $(DIR_OBJ) $(addprefix $(DIR_OBJ)/,$(OBJS)) $(IN_ADD)\r
 ifdef OUT_EXE\r
-       $(CC) $(LDFLAGS) -o $(OUT_EXE) $(addprefix $(DIR_OBJ)/,$(OBJS))\r
+       $(CC) $(LDFLAGS) -o $(OUT_EXE) $(addprefix $(DIR_OBJ)/,$(OBJS)) `wx-config --libs`\r
 endif\r
 \r
 clean:\r

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