Skip to content

Commit 05ecc54

Browse files
author
James Chen
committed
Merge pull request #5892 from dumganhar/master
[master] Fix compilation errors in TestCPP for marmalade port.
2 parents c3d6f71 + 5a13588 commit 05ecc54

File tree

2 files changed

+188
-334
lines changed

2 files changed

+188
-334
lines changed

extensions/proj.marmalade/cocos2dx-ext.mkf

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -140,73 +140,73 @@ files
140140
"*.h"
141141
"*.cpp"
142142

143-
["CocoStudio/Reader/WidgetReader]
144-
("../CocoStudio/Reader/WidgetReader)
143+
["CocoStudio/Reader/WidgetReader"]
144+
("../CocoStudio/Reader/WidgetReader")
145145
"*.h"
146146
"*.cpp"
147147

148-
["CocoStudio/Reader/WidgetReader/ButtonReader]
149-
("../CocoStudio/Reader/WidgetReader/ButtonReader)
148+
["CocoStudio/Reader/WidgetReader/ButtonReader"]
149+
("../CocoStudio/Reader/WidgetReader/ButtonReader")
150150
"*.h"
151151
"*.cpp"
152152

153-
["CocoStudio/Reader/WidgetReader/CheckBoxReader]
154-
("../CocoStudio/Reader/WidgetReader/CheckBoxReader)
153+
["CocoStudio/Reader/WidgetReader/CheckBoxReader"]
154+
("../CocoStudio/Reader/WidgetReader/CheckBoxReader")
155155
"*.h"
156156
"*.cpp"
157157

158-
["CocoStudio/Reader/WidgetReader/ImageViewReader]
159-
("../CocoStudio/Reader/WidgetReader/ImageViewReader)
158+
["CocoStudio/Reader/WidgetReader/ImageViewReader"]
159+
("../CocoStudio/Reader/WidgetReader/ImageViewReader")
160160
"*.h"
161161
"*.cpp"
162162

163-
["CocoStudio/Reader/WidgetReader/LabelAtlasReader]
164-
("../CocoStudio/Reader/WidgetReader/LabelAtlasReader)
163+
["CocoStudio/Reader/WidgetReader/LabelAtlasReader"]
164+
("../CocoStudio/Reader/WidgetReader/LabelAtlasReader")
165165
"*.h"
166166
"*.cpp"
167167

168-
["CocoStudio/Reader/WidgetReader/LabelBMFontReader]
169-
("../CocoStudio/Reader/WidgetReader/LabelBMFontReader)
168+
["CocoStudio/Reader/WidgetReader/LabelBMFontReader"]
169+
("../CocoStudio/Reader/WidgetReader/LabelBMFontReader")
170170
"*.h"
171171
"*.cpp"
172172

173-
["CocoStudio/Reader/WidgetReader/LabelReader]
174-
("../CocoStudio/Reader/WidgetReader/LabelReader)
173+
["CocoStudio/Reader/WidgetReader/LabelReader"]
174+
("../CocoStudio/Reader/WidgetReader/LabelReader")
175175
"*.h"
176176
"*.cpp"
177177

178-
["CocoStudio/Reader/WidgetReader/LayoutReader]
179-
("../CocoStudio/Reader/WidgetReader/LayoutReader)
178+
["CocoStudio/Reader/WidgetReader/LayoutReader"]
179+
("../CocoStudio/Reader/WidgetReader/LayoutReader")
180180
"*.h"
181181
"*.cpp"
182182

183-
["CocoStudio/Reader/WidgetReader/ListViewReader]
184-
("../CocoStudio/Reader/WidgetReader/ListViewReader)
183+
["CocoStudio/Reader/WidgetReader/ListViewReader"]
184+
("../CocoStudio/Reader/WidgetReader/ListViewReader")
185185
"*.h"
186186
"*.cpp"
187187

188-
["CocoStudio/Reader/WidgetReader/LoadingBarReader]
189-
("../CocoStudio/Reader/WidgetReader/LoadingBarReader)
188+
["CocoStudio/Reader/WidgetReader/LoadingBarReader"]
189+
("../CocoStudio/Reader/WidgetReader/LoadingBarReader")
190190
"*.h"
191191
"*.cpp"
192192

193-
["CocoStudio/Reader/WidgetReader/PageViewReader]
194-
("../CocoStudio/Reader/WidgetReader/PageViewReader)
193+
["CocoStudio/Reader/WidgetReader/PageViewReader"]
194+
("../CocoStudio/Reader/WidgetReader/PageViewReader")
195195
"*.h"
196196
"*.cpp"
197197

198-
["CocoStudio/Reader/WidgetReader/ScrollViewReader]
199-
("../CocoStudio/Reader/WidgetReader/ScrollViewReader)
198+
["CocoStudio/Reader/WidgetReader/ScrollViewReader"]
199+
("../CocoStudio/Reader/WidgetReader/ScrollViewReader")
200200
"*.h"
201201
"*.cpp"
202202

203-
["CocoStudio/Reader/WidgetReader/SliderReader]
204-
("../CocoStudio/Reader/WidgetReader/SliderReader)
203+
["CocoStudio/Reader/WidgetReader/SliderReader"]
204+
("../CocoStudio/Reader/WidgetReader/SliderReader")
205205
"*.h"
206206
"*.cpp"
207207

208-
["CocoStudio/Reader/WidgetReader/TextFieldReader]
209-
("../CocoStudio/Reader/WidgetReader/TextFieldReader)
208+
["CocoStudio/Reader/WidgetReader/TextFieldReader"]
209+
("../CocoStudio/Reader/WidgetReader/TextFieldReader")
210210
"*.h"
211211
"*.cpp"
212212

0 commit comments

Comments
 (0)