From 3ce5d090f26d61f3c9f45212057c323a6d279a42 Mon Sep 17 00:00:00 2001 From: sirakaba Date: Sat, 30 Oct 2010 11:06:38 +0000 Subject: [PATCH 1/1] =?utf8?q?MinGW=E3=81=A7=E3=81=AE=E3=83=AA=E3=83=B3?= =?utf8?q?=E3=82=AF=E3=82=A8=E3=83=A9=E3=83=BC=E3=82=92=E4=BF=AE=E6=AD=A3?= =?utf8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@396 9df91469-1e22-0410-86e7-ea8537beb833 --- src/common/Makefile.default | 4 ++-- src/plugin/Makefile.default | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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: -- 2.11.0