Statically link libaegisub

Dynamically linking it caused a steady stream of issues for no apparent
benefits.
This commit is contained in:
Thomas Goyne 2012-08-21 07:02:45 -07:00
parent 4208fa362c
commit b0036b4d99
5 changed files with 4 additions and 24 deletions

View file

@ -26,6 +26,7 @@ CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
CPPFLAGS = @CPPFLAGS@
CFLAGS_DEP = -MD -MP
LIBS = @LIBS@
LDFLAGS = @LDFLAGS@
INSTALL_FLAGS = -m 664
CCACHE_ENV = CCACHE_SLOPPINESS=time_macros

View file

@ -1,10 +1,7 @@
# $Id$
include ../Makefile.inc
LIB_SHARED = libaegisub-3.0.so
LIB_SHARED_INSTALL = yes
LIB_VERSION = 3
LIB = libaegisub.a
CXXFLAGS += -Iinclude -I../src -I.. -DLAGI -fPIC -Wno-variadic-macros

View file

@ -5,8 +5,7 @@ PROGRAM_INSTALL = yes
PRECOMPILED_HEADER_NAME=r_pre.h
CXXFLAGS += -Iinclude $(CFLAGS_WX) -I../libaegisub/include
LIBS += $(LIBS_WX) $(LIBS_LIBCURL) -L../libaegisub -laegisub-3.0 $(LIBS_UCHARDET) $(LIBS_GL)
LDFLAGS += -Wl,-rpath ../libaegisub
LIBS += $(LIBS_WX) $(LIBS_LIBCURL) -L../libaegisub -laegisub $(LIBS_UCHARDET) $(LIBS_GL)
# File-specific flags
upload.o: CXXFLAGS += $(CFLAGS_CURL)

View file

@ -10,7 +10,7 @@ AEGISUB_CFLAGS = -I. -I.. -Iinclude -I../libaegisub/include -I../build -DAEGISUB
CFLAGS += $(AEGISUB_CFLAGS)
CXXFLAGS += $(AEGISUB_CFLAGS) -D__STDC_FORMAT_MACROS $(CXXFLAGS_WX)
LIBS += -L../libaegisub -laegisub-3.0
LIBS := -L../libaegisub -laegisub $(LIBS)
LIBS += $(LIBS_CCMALLOC) $(LIBS_EFENCE) $(LIBS_GL)
LIBS += $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE)
LIBS += $(LIBS_FONTCONFIG) $(LIBS_FFTW3)

View file

@ -1,17 +0,0 @@
#!/bin/sh
BINDIR="$(dirname "$0")"
BIN="$BINDIR/aegisub-3.0"
LIBDIR="$BINDIR/../libaegisub"
if ! test -x "${BIN}"; then
echo "${BIN} does not exist or is not executable.";
exit 1;
fi
case "$1" in
"gdb")
GDB="gdb"
;;
esac
LD_LIBRARY_PATH="$LIBDIR" exec $GDB "./$BIN"