Mercurial > hg > forks > UniversalIndentGUI

changeset 735:f2da6de11815

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed the qmake project file to include QScintilla as framework to the mac version. git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@1012 59b1889a-e5ac-428c-b0c7-476e01d41282
author thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282>
date Sun, 19 Sep 2010 11:28:49 +0000
parents 53de31f7e55b
children 1109652dbb56
files UniversalIndentGUI.pro
diffstat 1 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/UniversalIndentGUI.pro	Sun Sep 12 18:15:49 2010 +0000
+++ b/UniversalIndentGUI.pro	Sun Sep 19 11:28:49 2010 +0000
@@ -1,6 +1,6 @@
 TEMPLATE = app
 QT += network
-QT += script 
+QT += script
 
 unix:TARGET = universalindentgui
 win32:TARGET = UniversalIndentGUI
@@ -13,15 +13,18 @@
 
 INCLUDEPATH += src
 
-LIBS += -lqscintilla2
-
 CONFIG += debug_and_release
 
 macx {
- CONFIG += x86 ppc sdk
- QMAKE-MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
+ CONFIG += x86 x86_64 sdk
+ # qscintilla needs to be build with:
+ # qmake -spec macx-g++ CONFIG+=sdk CONFIG+=x86_64 CONFIG+=x86 CONFIG+=lib_bundle qscintilla.pro && make && sudo make install
+ LIBS += -framework qscintilla2
  ICON = resources/UniversalIndentGUI.icns
 }
+else {
+ LIBS += -lqscintilla2
+}
 
 CONFIG(release, debug|release) {