OSDN Git Service

Fixed Mac build.
authortkawata <tkawata@users.sourceforge.jp>
Sat, 28 Apr 2012 13:39:14 +0000 (22:39 +0900)
committertkawata <tkawata@users.sourceforge.jp>
Sat, 28 Apr 2012 13:39:14 +0000 (22:39 +0900)
Fixed the comment in sample content Sample3_Arduino1.

Samples/Samples/Sample3_Arduino1/ui/index.html
Source/Source.pro

index 332697a..99cd502 100644 (file)
@@ -32,7 +32,7 @@ function stopTimer()
 </td>
 </tr>
 <tr>
-<td>Input from Arduino Analog1</td>
+<td>Input from Arduino Analog0</td>
 <td>
 <input type="text" value="0" disabled  size="4" style="text-align:right" id="analog1Value"/>
 </td>
index eb737d0..b5a258d 100644 (file)
@@ -140,11 +140,18 @@ CONFIG(debug,debug|release) {
 }
 
 CONFIG(debug,debug|release) {
-    win32:QMAKE_POST_LINK = "copy ..\\Thirdparty\\qt\\qserialdevice-qserialdevice\\src\\debug\\SerialPort.dll ..\\bin"
-    unix:QMAKE_POST_LINK = "cp ../Thirdparty/qt/qserialdevice-qserialdevice/src/libSerialPort.so ../bin"
-
+    macx {
+        QMAKE_POST_LINK = "cp ../Thirdparty/qt/qserialdevice-qserialdevice/src/libSerialPort.1.dylib ../bin/QtDennco.app/Contents/MacOS"
+    } else {
+        win32:QMAKE_POST_LINK = "copy ..\\Thirdparty\\qt\\qserialdevice-qserialdevice\\src\\debug\\SerialPort.dll ..\\bin"
+        unix:QMAKE_POST_LINK = "cp ../Thirdparty/qt/qserialdevice-qserialdevice/src/libSerialPort.so ../bin"
+    }
 } else {
-    win32:QMAKE_POST_LINK = "copy ..\\Thirdparty\\qt\\qserialdevice-qserialdevice\\src\\release\\SerialPort.dll ..\\bin"
-    unix:QMAKE_POST_LINK = "cp ../Thirdparty/qt/qserialdevice-qserialdevice/src/libSerialPort.so ../bin"
+    macx {
+        QMAKE_POST_LINK = "cp ../Thirdparty/qt/qserialdevice-qserialdevice/src/libSerialPort.1.dylib ../bin/QtDennco.app/Contents/MacOS"
+    } else {
+        win32:QMAKE_POST_LINK = "copy ..\\Thirdparty\\qt\\qserialdevice-qserialdevice\\src\\release\\SerialPort.dll ..\\bin"
+        unix:QMAKE_POST_LINK = "cp ../Thirdparty/qt/qserialdevice-qserialdevice/src/libSerialPort.so ../bin"
+    }
 }