File tree Expand file tree Collapse file tree 2 files changed +3
-15
lines changed Expand file tree Collapse file tree 2 files changed +3
-15
lines changed Original file line number Diff line number Diff line change 117
117
" build-cfg.json"
118
118
]
119
119
},
120
- {
121
- "from" : " tools/simulator/frameworks/runtime-src/proj.win32" ,
122
- "to" : " js-template-binary/frameworks/runtime-src/proj.win32/" ,
123
- "include" : [
124
- " game.rc" ,
125
- " main.cpp" ,
126
- " main.h" ,
127
- " res" ,
128
- " resource.h" ,
129
- " SimulatorWin.cpp" ,
130
- " SimulatorWin.h"
131
- ]
132
- },
133
120
{
134
121
"from" : " cocos/platform/android/java/src" ,
135
122
"to" : " cpp-template-binary/proj.android/src"
Original file line number Diff line number Diff line change @@ -127,7 +127,8 @@ def modify_win32_maincpp(self):
127
127
cpp_files = win32_cfg ['main_cpps' ]
128
128
link_libs_cfg = win32_cfg ['link_libs' ]
129
129
130
- check_pattern = r'^int[\s]+APIENTRY[\s]+_tWinMain'
130
+ check_pattern1 = r'^int[\s]+APIENTRY[\s]+_tWinMain'
131
+ check_pattern2 = r'^int[\s]+WINAPI[\s]+_tWinMain'
131
132
for main_cpp in cpp_files :
132
133
cpp_full_path = os .path .join (self .engine_template_dir , main_cpp )
133
134
@@ -145,7 +146,7 @@ def modify_win32_maincpp(self):
145
146
new_lines = []
146
147
for line in old_lines :
147
148
strip_line = line .strip ()
148
- if re .match (check_pattern , strip_line ):
149
+ if re .match (check_pattern1 , strip_line ) or re . match ( check_pattern2 , strip_line ):
149
150
new_lines .append ('#if _MSC_VER > 1800\n ' )
150
151
for lib in link_libs :
151
152
new_lines .append ('%s\n ' % self .get_lib_str (lib , 2015 ))
You can’t perform that action at this time.
0 commit comments