Update mac platform files

build · build · commit ee5f215c38d9 · 2013-12-30T16:39:04.000+02:00
diff --git a/platform/mac/wd_qt4.8.5.gypi b/platform/mac/wd_qt4.8.5.gypi
@@ -1,9 +1,8 @@
 {
   'variables': {
     'QT5': '0', # change to '1' for enabling Qt5
-    'QT_BIN_PATH': '/usr/local/Trolltech/Qt-4.8.5/bin',
-    'QT_INC_PATH': '/usr/local/Trolltech/Qt-4.8.5/include',
-    'QT_LIB_PATH': '/usr/local/Trolltech/Qt-4.8.5/lib',
-    'INTERMEDIATE_DIR': 'mocs',
+    'QT_BIN_PATH': '/usr/local/opt/qt4/bin',
+    'QT_INC_PATH': '/usr/local/opt/qt4/include',
+    'QT_LIB_PATH': '/usr/local/opt/qt4/lib',
   },
 }
diff --git a/platform/mac/wd_qt5.1.0.gypi b/platform/mac/wd_qt5.1.0.gypi
@@ -1,9 +1,8 @@
 {
   'variables': {
     'QT5': '1', # change to '1' for enabling Qt5
-    'QT_BIN_PATH': '/usr/local/Qt-5.1.0/bin',
-    'QT_INC_PATH': '/usr/local/Qt-5.1.0/include',
-    'QT_LIB_PATH': '/usr/local/Qt-5.1.0/lib',
-    'INTERMEDIATE_DIR': 'mocs',
+    'QT_BIN_PATH': '/usr/local/opt/qt5/bin',
+    'QT_INC_PATH': '/usr/local/opt/qt5/include',
+    'QT_LIB_PATH': '/usr/local/opt/qt5/lib',
   },
 }
diff --git a/platform/mac/wd_qt5.2.0_64.gypi b/platform/mac/wd_qt5.2.0_64.gypi
@@ -0,0 +1,8 @@
+{
+  'variables': {
+    'QT5': '1', # change to '1' for enabling Qt5
+    'QT_BIN_PATH': '/usr/local/opt/qt5_64/bin',
+    'QT_INC_PATH': '/usr/local/opt/qt5_64/include',
+    'QT_LIB_PATH': '/usr/local/opt/qt5_64/lib',
+  },
+}

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`'variables': {`
`3`	`3`	`'QT5': '0', # change to '1' for enabling Qt5`
`4`		`- 'QT_BIN_PATH': '/usr/local/Trolltech/Qt-4.8.5/bin',`
`5`		`- 'QT_INC_PATH': '/usr/local/Trolltech/Qt-4.8.5/include',`
`6`		`- 'QT_LIB_PATH': '/usr/local/Trolltech/Qt-4.8.5/lib',`
`7`		`- 'INTERMEDIATE_DIR': 'mocs',`
	`4`	`+ 'QT_BIN_PATH': '/usr/local/opt/qt4/bin',`
	`5`	`+ 'QT_INC_PATH': '/usr/local/opt/qt4/include',`
	`6`	`+ 'QT_LIB_PATH': '/usr/local/opt/qt4/lib',`
`8`	`7`	`},`
`9`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`'variables': {`
`3`	`3`	`'QT5': '1', # change to '1' for enabling Qt5`
`4`		`- 'QT_BIN_PATH': '/usr/local/Qt-5.1.0/bin',`
`5`		`- 'QT_INC_PATH': '/usr/local/Qt-5.1.0/include',`
`6`		`- 'QT_LIB_PATH': '/usr/local/Qt-5.1.0/lib',`
`7`		`- 'INTERMEDIATE_DIR': 'mocs',`
	`4`	`+ 'QT_BIN_PATH': '/usr/local/opt/qt5/bin',`
	`5`	`+ 'QT_INC_PATH': '/usr/local/opt/qt5/include',`
	`6`	`+ 'QT_LIB_PATH': '/usr/local/opt/qt5/lib',`
`8`	`7`	`},`
`9`	`8`	`}`