Reverted to dynamic lib model and reduced dependencies on system libs…

… even further.
dinvlad · Sep 19, 2011 · 84654cc · 84654cc
1 parent bcdd62c
commit 84654cc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/goldendict.pro b/goldendict.pro
@@ -89,7 +89,6 @@ unix:!mac {
     INSTALLS += desktops2
 }
 mac {
-    QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.6.sdk
     CONFIG += x86 x86_64
     LIBS = -lz \
         -liconv \
@@ -101,7 +100,7 @@ mac {
     LIBS += -Lmaclibs/lib
     ICON = icons/macicon.icns
     QMAKE_POST_LINK = mkdir -p goldendict.app/Contents/Frameworks & \
-        cp maclibs/lib/* goldendict.app/Contents/Frameworks/ & \
+        cp -nR maclibs/lib/ goldendict.app/Contents/Frameworks/
 }
 DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"
 

diff --git a/maclibs/include/iconv.h b/maclibs/include/iconv.h
@@ -49,7 +49,7 @@ extern LIBICONV_DLL_EXPORTED  int _libiconv_version; /* Likewise */
 
 /* Define iconv_t ourselves. */
 #undef iconv_t
-#define iconv_t libiconv_t
+#define iconv_t iconv_t
 typedef void* iconv_t;
 
 /* Get size_t declaration.

diff --git a/maclibs/lib/libiconv.a → maclibs/lib/libiconv.dylib b/maclibs/lib/libiconv.a → maclibs/lib/libiconv.dylib