mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

On OS X shared librarys end with .dylib not .so, this fixes the (lame) workaround

Browse source 
for auto3 linking.

Originally committed to SVN as r2676.
This commit is contained in:
Amar Takhar 2009-01-08 08:46:10 +00:00
parent 81a168d625
commit 852ceef55d
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
aegisub/Makefile.am
View file

@ -116,12 +116,18 @@ aegisub_2_1_LDFLAGS += @RUBY_LDFLAGS@
aegisub_2_1_LDADD += libauto4_ruby.a aegisub_2_1_LDADD += libauto4_ruby.a
endif endif
if BUILD_DARWIN
AUTO3_LIB = ../auto3/.libs/libaegisub-auto3-2.1.0.dylib
else
AUTO3_LIB = ../auto3/.libs/libaegisub-auto3-2.1.so
endif
if HAVE_AUTO3_LUA if HAVE_AUTO3_LUA
AUTO3_LUA = auto4_auto3.cpp AUTO3_LUA = auto4_auto3.cpp
# This is a workaround top stop libtool from binging in dependency_libs which # This is a workaround top stop libtool from binging in dependency_libs which
# causes many link errors due to auto4 (lua 5.1) support. # causes many link errors due to auto4 (lua 5.1) support.
#aegisub_2_1_LDADD += -L$(srcdir)/../auto3 -laegisub-auto3-2.1 #aegisub_2_1_LDADD += -L$(srcdir)/../auto3 -laegisub-auto3-2.1
aegisub_2_1_LDADD += ../auto3/.libs/libaegisub-auto3-2.1.so aegisub_2_1_LDADD += ${AUTO3_LIB}
endif endif
if HAVE_HUNSPELL if HAVE_HUNSPELL

3
aegisub/standard_paths.cpp
View file

@ -66,6 +66,9 @@ StandardPaths::StandardPaths() {
#ifdef __WINDOWS__ #ifdef __WINDOWS__
wxString dataDir = paths.GetDataDir(); wxString dataDir = paths.GetDataDir();
wxString userDir = paths.GetUserDataDir(); wxString userDir = paths.GetUserDataDir();
#elif defined(__APPLE__)
wxString dataDir = paths.GetDataDir();
wxString userDir = paths.GetUserDataDir() + _T("-") + _T(AEGISUB_VERSION_DATA);
#else #else
wxString dataDir = paths.GetDataDir() + _T("/") + _T(AEGISUB_VERSION_DATA); wxString dataDir = paths.GetDataDir() + _T("/") + _T(AEGISUB_VERSION_DATA);
wxString userDir = paths.GetUserDataDir() + _T("-") + _T(AEGISUB_VERSION_DATA); wxString userDir = paths.GetUserDataDir() + _T("-") + _T(AEGISUB_VERSION_DATA);