Changeset 56 for psi/trunk/iris

Timestamp:

Sep 21, 2006, 9:40:35 PM (19 years ago)

Author:

dmik

Message:

Psi: General: All output directories are made OS-specific (by adding the OS name to the path), to make it possible to build Psi for different platforms from a single source tree.

Location:

psi/trunk/iris/example

Files:

• example.pri (modified) (1 diff)
• server/server.pro (modified) (1 diff)
• xmpptest/xmpptest.pro (modified) (1 diff)

psi/trunk/iris/example/example.pri

@@ +1 @@
+OS = unknown
+os2:OS = os2
+win32:OS = win
+unix:OS = nix
+mac:OS = mac
+
 # stay clean
-MOC_DIR        = .moc
-OBJECTS_DIR    = .obj
-UI_DIR         = .ui
+debug: {
+        MOC_DIR        = .debug/.$$OS/.moc
+        OBJECTS_DIR    = .debug/.$$OS/.obj
+        UI_DIR         = .debug/.$$OS/.ui
+} else {
+        MOC_DIR        = .$$OS/.moc
+        OBJECTS_DIR    = .$$OS/.obj
+        UI_DIR         = .$$OS/.ui
+}
 
 # include some of cutestuff

psi/trunk/iris/example/server/server.pro

@@ -3 +3 @@
 TARGET = server
 
-MOC_DIR        = .moc
-OBJECTS_DIR    = .obj
-UI_DIR         = .ui
+OS = unknown
+os2:OS = os2
+win32:OS = win
+unix:OS = nix
+mac:OS = mac
+
+debug: {
+        MOC_DIR        = .debug/.$$OS/.moc
+        OBJECTS_DIR    = .debug/.$$OS/.obj
+        UI_DIR         = .debug/.$$OS/.ui
+} else {
+        MOC_DIR        = .$$OS/.moc
+        OBJECTS_DIR    = .$$OS/.obj
+        UI_DIR         = .$$OS/.ui
+}
 
 include(../xmpptest/iris.pri)

psi/trunk/iris/example/xmpptest/xmpptest.pro

@@ -3 +3 @@
 TARGET  = xmpptest
 
-MOC_DIR        = .moc
-OBJECTS_DIR    = .obj
-UI_DIR         = .ui
+OS = unknown
+os2:OS = os2
+win32:OS = win
+unix:OS = nix
+mac:OS = mac
+
+debug: {
+        MOC_DIR        = .debug/.$$OS/.moc
+        OBJECTS_DIR    = .debug/.$$OS/.obj
+        UI_DIR         = .debug/.$$OS/.ui
+} else {
+        MOC_DIR        = .$$OS/.moc
+        OBJECTS_DIR    = .$$OS/.obj
+        UI_DIR         = .$$OS/.ui
+}
 
 #DEFINES += CS_XMPP