mac commit1

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@57256 954022d7-b5bf-4e40-9824-e11837661b57

DesktopEditor/Qt_build/test/control/control.pro

@@ -12,39 +12,57 @@ TARGET = control
 TEMPLATE = app
 
 DEFINES += \
+    _QT
+
+CONFIG(debug, debug|release) {
+    LIBS += -L../../editor/Debug -lnative_control
+    LIBS += -L../../graphics/Debug -lgraphics
+    message(debug)
+} else {
+    LIBS += -L../../editor/Release -lnative_control
+    LIBS += -L../../graphics/Release -lgraphics
+    message(release)
+}
+
+linux-g++ | linux-g++-64 | linux-g++-32 {
+    DEFINES += \
+    LINUX \
+    _LINUX \
+    _LINUX_QT
+
+    LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_base.ia32
+    LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_snapshot
+    LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_nosnapshot.ia32
+    LIBS += -L../../../../../../../../../v8/out/native/obj.target/third_party/icu -licui18n
+    LIBS += -L../../../../../../../../../v8/out/native/obj.target/third_party/icu -licuuc
+    LIBS += -L../../../../../../../../../v8/out/native/obj.target/third_party/icu -licudata
+}
+
+mac {
+    DEFINES += \
     LINUX \
     _LINUX \
     _LINUX_QT \
-    _QT \
-    _QTX
+    _MAC \
+    QT_MAC
+
+    LIBS += -L../../../../../../../../../v8/out/native -lv8_base.x64
+    LIBS += -L../../../../../../../../../v8/out/native -lv8_snapshot
+    LIBS += -L../../../../../../../../../v8/out/native -lv8_nosnapshot.x64
+    LIBS += -L../../../../../../../../../v8/out/native -licui18n
+    LIBS += -L../../../../../../../../../v8/out/native -licuuc
+    LIBS += -L../../../../../../../../../v8/out/native -licudata
+}
+
+win32 {
+    DEFINES += \
+    WIN32
+}
 
 INCLUDEPATH += \
     ../../../agg-2.4/include \
     ../../../freetype-2.5.2/include \
-    ../../../../../../../../../v8/include
-
-CONFIG(debug, debug|release) {
-LIBS += -lX11
-LIBS += -L../../editor/Debug -lnative_control
-LIBS += -L../../graphics/Debug -lgraphics
-LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_base.ia32
-LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_snapshot
-LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_nosnapshot.ia32
-LIBS += -L../../../../../../../../../v8/out/native/obj.target/third_party/icu -licui18n
-LIBS += -L../../../../../../../../../v8/out/native/obj.target/third_party/icu -licuuc
-LIBS += -L../../../../../../../../../v8/out/native/obj.target/third_party/icu -licudata
-message(debug)
-} else {
-LIBS += -L../../editor/Release -lnative_control
-LIBS += -L../../graphics/Release -lgraphics
-LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_base.ia32
-LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_snapshot
-LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_nosnapshot.ia32
-LIBS += -L../../../../../../../../../v8/out/native/obj.target/third_party/icu -licui18n
-LIBS += -L../../../../../../../../../v8/out/native/obj.target/third_party/icu -licuuc
-LIBS += -L../../../../../../../../../v8/out/native/obj.target/third_party/icu -licudata
-message(release)
-}
+    .../../../../../../../../../v8/include
 
 SOURCES += main.cpp\
         mainwindow.cpp