[X2Go-Dev] [PATCH] Prettify x2goclient.pro. Build universal on OS X.

[Mihai Moldovan]

Use the Mac OS X 10.5 SDK instead 10.6 to remain compatible with
Leopard.

Signed-off-by: Mihai Moldovan <ionic at ionic.de>
---
 x2goclient.pro |  141
++++++++++++++++++++++++++++---------------------------
 1 files changed, 72 insertions(+), 69 deletions(-)

diff --git a/x2goclient.pro b/x2goclient.pro
index 5c96688..2bb7cdc 100755
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -33,76 +33,76 @@ HEADERS += configdialog.h \
            userbutton.h \
        x2goclientconfig.h \
        x2gologdebug.h \
- printprocess.h \
- cupsprint.h \
- cupsprintwidget.h \
- cupsprintersettingsdialog.h \
- printwidget.h \
- printercmddialog.h \
- printdialog.h \
- wapi.h \
- sessionwidget.h \
- configwidget.h \
- connectionwidget.h \
- settingswidget.h \
- sharewidget.h \
- clicklineedit.h \
- httpbrokerclient.h \
- ongetpass.h \
- onmainwindow_privat.h \
- x2gosettings.h \
- brokerpassdlg.h \
- contest.h \
- xsettingswidget.h
+           printprocess.h \
+           cupsprint.h \
+           cupsprintwidget.h \
+           cupsprintersettingsdialog.h \
+           printwidget.h \
+           printercmddialog.h \
+           printdialog.h \
+           wapi.h \
+           sessionwidget.h \
+           configwidget.h \
+           connectionwidget.h \
+           settingswidget.h \
+           sharewidget.h \
+           clicklineedit.h \
+           httpbrokerclient.h \
+           ongetpass.h \
+           onmainwindow_privat.h \
+           x2gosettings.h \
+           brokerpassdlg.h \
+           contest.h \
+           xsettingswidget.h
 
 SOURCES += sharewidget.cpp \
- settingswidget.cpp\
- configwidget.cpp \
- sessionwidget.cpp \
- connectionwidget.cpp \
- configdialog.cpp \
- editconnectiondialog.cpp \
- exportdialog.cpp \
- imgframe.cpp \
- LDAPSession.cpp \
- onmainwindow.cpp \
- onmainwindow_part2.cpp \
- onmainwindow_part3.cpp \
- onmainwindow_part4.cpp \
- sessionbutton.cpp \
- sessionmanagedialog.cpp \
- sshmasterconnection.cpp \
- sshprocess.cpp \
- SVGFrame.cpp \
- userbutton.cpp \
- x2gologdebug.cpp \
- printprocess.cpp \
- cupsprint.cpp \
- cupsprintwidget.cpp \
- cupsprintersettingsdialog.cpp \
- printwidget.cpp \
- printercmddialog.cpp \
- printdialog.cpp \
- wapi.cpp \
- clicklineedit.cpp \
- httpbrokerclient.cpp \
- ongetpass.cpp \
- x2gosettings.cpp \
- brokerpassdlg.cpp \
- contest.cpp \
- xsettingswidget.cpp
+           settingswidget.cpp\
+           configwidget.cpp \
+           sessionwidget.cpp \
+           connectionwidget.cpp \
+           configdialog.cpp \
+           editconnectiondialog.cpp \
+           exportdialog.cpp \
+           imgframe.cpp \
+           LDAPSession.cpp \
+           onmainwindow.cpp \
+           onmainwindow_part2.cpp \
+           onmainwindow_part3.cpp \
+           onmainwindow_part4.cpp \
+           sessionbutton.cpp \
+           sessionmanagedialog.cpp \
+           sshmasterconnection.cpp \
+           sshprocess.cpp \
+           SVGFrame.cpp \
+           userbutton.cpp \
+           x2gologdebug.cpp \
+           printprocess.cpp \
+           cupsprint.cpp \
+           cupsprintwidget.cpp \
+           cupsprintersettingsdialog.cpp \
+           printwidget.cpp \
+           printercmddialog.cpp \
+           printdialog.cpp \
+           wapi.cpp \
+           clicklineedit.cpp \
+           httpbrokerclient.cpp \
+           ongetpass.cpp \
+           x2gosettings.cpp \
+           brokerpassdlg.cpp \
+           contest.cpp \
+           xsettingswidget.cpp
 
 LIBS += -lssh
 
 plugin {
-TARGET = x2goplugin
+    TARGET = x2goplugin
 }
-else{
-RC_FILE = x2goclient.rc
-SOURCES += x2goclient.cpp
-TARGET = x2goclient
-DEFINES += CFGCLIENT
-message(if you want to build x2goplugin you should export
X2GO_CLIENT_TARGET=plugin)
+else {
+    RC_FILE = x2goclient.rc
+    SOURCES += x2goclient.cpp
+    TARGET = x2goclient
+    DEFINES += CFGCLIENT
+    message(if you want to build x2goplugin you should export
X2GO_CLIENT_TARGET=plugin)
 }
 
 TEMPLATE = app
@@ -127,7 +127,8 @@ x2go_linux_static {
 
 macx {
     message(building $$TARGET with ldap and cups)
-    LIBS += -lldap -lcups
+    LIBS += -framework LDAP -lcups -lcrypto -lssl -lz
+    CONFIG += x86 x86_64
 }
 win32-* {
     message(building $$TARGET for windows without ldap and cups)
@@ -135,13 +136,14 @@ win32-* {
     CONFIG += static release
 }
 QT += svg network
-ICON =icons/x2go-mac.icns
-QMAKE_MAC_SDK =/Developer/SDKs/MacOSX10.6.sdk
+ICON = icons/x2go-mac.icns
+QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk
+QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
 
 
-plugin{
+plugin {
+   DEFINES += CFGPLUGIN
 
-DEFINES += CFGPLUGIN
    linux-g++ {
       include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri)
    }
@@ -153,5 +155,6 @@ DEFINES += CFGPLUGIN
          CONFIG += qaxserver
          include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri)
    }
-RC_FILE = x2goplugin.rc
+
+   RC_FILE = x2goplugin.rc
 }
-- 
1.7.9


-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 4369 bytes
Desc: S/MIME Cryptographic Signature
URL: <http://lists.x2go.org/pipermail/x2go-dev/attachments/20120226/e8dcede7/attachment.bin>