Skip to content

Commit fc3ce0d

Browse files
buildbuild
authored andcommitted
Update build configuration for Mac
1 parent d87e056 commit fc3ce0d

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

build_mac.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,11 @@
22
python generate_wdversion.py
33

44
gyp --depth . -G output_dir=. -D platform=desktop -D mode=release --generator-output=out/ wd.gyp
5+
6+
if [ "$1" == "-all" ]
7+
then
8+
9+
xcodebuild -project ./out/wd.xcodeproj -alltargets #clean build
10+
11+
fi
12+

wd_test.gyp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,11 @@
173173
[ 'OS=="mac"', {
174174
'link_settings': {
175175
'libraries': [
176-
'<(QT_LIB_PATH)/libQtGui.a',
177-
'<(QT_LIB_PATH)/libQtCore.a',
178-
'<(QT_LIB_PATH)/libQtNetwork.a',
179-
'<(QT_LIB_PATH)/libQtDeclarative.a',
180-
'<(QT_LIB_PATH)/libQtXml.a',
176+
'<(QT_LIB_PATH)/QtGui.framework',
177+
'<(QT_LIB_PATH)/QtCore.framework',
178+
'<(QT_LIB_PATH)/QtNetwork.framework',
179+
'<(QT_LIB_PATH)/QtDeclarative.framework',
180+
'<(QT_LIB_PATH)/QtXml.framework',
181181
'$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
182182
'$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
183183
'$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework',
@@ -308,7 +308,7 @@
308308
} ],
309309
[ 'OS=="mac" or OS=="ios"', {
310310
'link_settings': {
311-
'libraries': ['<(QT_LIB_PATH)/libQtWebKit.a',],
311+
'libraries': ['<(QT_LIB_PATH)/QtWebKit.framework',],
312312
},
313313
} ],
314314
],

0 commit comments

Comments
 (0)