Skip to content

Commit bb432ca

Browse files
author
Mykola Tryshnivskyy
committed
Fixed Win32 project generating and compilation
1 parent ae1b7ae commit bb432ca

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

wd.gyp

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -213,14 +213,17 @@
213213
],
214214
} ]
215215
],
216-
'actions': [{
217-
'action_name' : 'input_dir',
218-
'inputs' : [],
219-
'outputs': [
220-
'<(INTERMEDIATE_DIR)',
221-
],
222-
'action': ['mkdir', '-p', '<(INTERMEDIATE_DIR)'],
223-
}],
216+
217+
'conditions': [
218+
['OS=="linux"', {
219+
'actions': [ {
220+
'action_name' : 'input_dir',
221+
'inputs' : [],
222+
'outputs' : ['<(INTERMEDIATE_DIR)'],
223+
'action' : ['mkdir', '-p', '<(INTERMEDIATE_DIR)'],
224+
} ],
225+
} ]
226+
],
224227

225228
'rules': [
226229
{

wd.gypi.win.sample

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
'variables': {
33
'DESKTOP_QT_BIN_PATH': 'c:/Qt/4_8_4/bin',
44
'DESKTOP_QT_INC_PATH': 'c:/Qt/4_8_4/include',
5-
'DESKTOP_QT_LIB_PATH': 'c:/Qt/4_8_4/lib'
5+
'DESKTOP_QT_LIB_PATH': 'c:/Qt/4_8_4/lib',
6+
'INTERMEDIATE_DIR': 'c:\\GIT\\wd\\mocs'
67
},
78
}

0 commit comments

Comments
 (0)