Skip to content

Commit 3a91e4d

Browse files
livecodefraserlivecodefraser
committed
Get Win32 LC7.0 building via Gyp
1 parent cb2f7be commit 3a91e4d

13 files changed

Lines changed: 18 additions & 30 deletions

File tree

‎engine/engine-sources.gypi‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,7 @@
540540
'src/desktop-pasteboard.cpp',
541541
'src/desktop-image.cpp',
542542
'src/desktop-ans.cpp',
543+
'src/legacy_spec.cpp',
543544

544545
# Group "Platform"
545546
'src/platform.h',
@@ -656,7 +657,6 @@
656657
'src/w32relaunch.cpp',
657658
'src/w32script.cpp',
658659
'src/w32sound.cpp',
659-
'src/w32spec.cpp',
660660
'src/w32stack.cpp',
661661
'src/w32text.cpp',
662662
'src/w32textlayout.cpp',
@@ -709,7 +709,6 @@
709709
'src/minizip.h',
710710
'src/bsdiff_apply.cpp',
711711
'src/internal.cpp',
712-
'src/legacy_spec.cpp',
713712
'src/minizip.cpp',
714713
'src/mode_installer.cpp',
715714
'src/mode_installer_lnx.cpp',
@@ -720,7 +719,6 @@
720719
# Sources for the standalone engine
721720
'engine_standalone_mode_source_files':
722721
[
723-
'src/legacy_spec.cpp',
724722
'src/mode_standalone.cpp',
725723
],
726724

@@ -819,19 +817,6 @@
819817
'src/player-platform.cpp',
820818
'src/stacke.cpp',
821819
],
822-
823-
'conditions':
824-
[
825-
[
826-
'OS == "win"',
827-
{
828-
'engine_server_exclude_files':
829-
[
830-
'src/opensslsocket.cpp',
831-
],
832-
}
833-
],
834-
],
835820
},
836821

837822
'target_defaults':

‎engine/kernel-server.gypi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@
143143
'-loleaut32',
144144
'-lrpcrt4',
145145
'-lshell32',
146+
'-lshlwapi',
146147
'-luser32',
147148
'-lusp10',
148149
'-lwinmm',

‎engine/kernel.gypi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@
188188
'-loleaut32',
189189
'-lrpcrt4',
190190
'-lshell32',
191+
'-lshlwapi',
191192
'-luser32',
192193
'-lusp10',
193194
'-lwinmm',

‎engine/src/dskw32.cpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ static bool get_device_path(MCStringRef p_path, MCStringRef &r_device_path)
167167
// MW-2005-02-22: Make these global for opensslsocket.cpp
168168
static Boolean wsainited = False;
169169
HWND sockethwnd;
170+
HANDLE g_socket_wakeup;
170171

171172
Boolean wsainit()
172173
{
@@ -2536,7 +2537,7 @@ struct MCWindowsDesktop: public MCSystemInterface, public MCWindowsSystemService
25362537

25372538
// What is the length of the path that was retrieved?
25382539
size_t t_path_len;
2539-
/* UNCHECKED */ StringCchLength(t_buffer.Ptr(), t_buffer.Size(), &t_path_len);
2540+
/* UNCHECKED */ StringCchLengthW(t_buffer.Ptr(), t_buffer.Size(), &t_path_len);
25402541

25412542
/* UNCHECKED */ MCStringCreateWithChars(t_buffer.Ptr(), t_path_len, &t_retrieved_path);
25422543
}
@@ -2742,7 +2743,7 @@ struct MCWindowsDesktop: public MCSystemInterface, public MCWindowsSystemService
27422743

27432744
// Get the length of the returned path
27442745
size_t t_pathlen;
2745-
if (t_wasfound && StringCchLength(t_buffer.Ptr(), t_buffer.Size(), &t_pathlen) != S_OK)
2746+
if (t_wasfound && StringCchLengthW(t_buffer.Ptr(), t_buffer.Size(), &t_pathlen) != S_OK)
27462747
return false;
27472748

27482749
// Path was successfully retrieved
@@ -3476,7 +3477,7 @@ struct MCWindowsDesktop: public MCSystemInterface, public MCWindowsSystemService
34763477
do
34773478
{
34783479
// Don't list the current directory
3479-
if (lstrcmpi(data.cFileName, L".") == 0)
3480+
if (lstrcmpiW(data.cFileName, L".") == 0)
34803481
continue;
34813482

34823483
// Retrieve as many of the file attributes as Windows supports
@@ -4612,7 +4613,7 @@ struct MCWindowsDesktop: public MCSystemInterface, public MCWindowsSystemService
46124613
// If the launched process vanished before (4) it is treated as failure.
46134614

46144615
unichar_t t_parameters[64];
4615-
wsprintf(t_parameters, L"-elevated-slave%08x", GetCurrentThreadId());
4616+
wsprintfW(t_parameters, L"-elevated-slave%08x", GetCurrentThreadId());
46164617

46174618
MCAutoStringRefAsWString t_cmd_wstr;
46184619
/* UNCHECKED */ t_cmd_wstr.Lock(MCcmd);

‎engine/src/w32ans.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,7 @@ int MCA_folder(MCStringRef p_title, MCStringRef p_prompt, MCStringRef p_initial,
914914
MCValueRelease(s_last_folder);
915915

916916
size_t t_length;
917-
/* UNCHECKED */ StringCchLength(t_buffer.Ptr(), t_buffer.Size(), &t_length);
917+
/* UNCHECKED */ StringCchLengthW(t_buffer.Ptr(), t_buffer.Size(), &t_length);
918918
/* UNCHECKED */ MCStringCreateWithChars(t_buffer.Ptr(), t_length, s_last_folder);
919919

920920
MCAutoStringRef t_std_path;

‎engine/src/w32dce.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ uint1 MCScreenDC::fontnametocharset(MCStringRef p_font)
658658
MCAutoStringRefAsWString t_font_wstr;
659659
/* UNCHECKED */ t_font_wstr.Lock(p_font);
660660

661-
/* UNCHECKED */ StringCchCopy(logfont.lfFaceName, LF_FACESIZE, *t_font_wstr);
661+
/* UNCHECKED */ StringCchCopyW(logfont.lfFaceName, LF_FACESIZE, *t_font_wstr);
662662

663663
//parse font and encoding
664664
logfont.lfCharSet = DEFAULT_CHARSET;

‎engine/src/w32flst.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ int CALLBACK fontnames_FontFamProc(const LOGFONTW * lpelf,
335335
MCNewAutoNameRef t_name;
336336

337337
size_t t_length;
338-
if (StringCchLength(lpelf->lfFaceName, LF_FACESIZE, &t_length) != S_OK)
338+
if (StringCchLengthW(lpelf->lfFaceName, LF_FACESIZE, &t_length) != S_OK)
339339
return False;
340340

341341
if (!MCNameCreateWithChars(lpelf->lfFaceName, t_length, &t_name))
@@ -463,7 +463,7 @@ bool MCFontlist::getfontsizes(MCStringRef p_fname, MCListRef& r_sizes)
463463
lf.lfPitchAndFamily = 0;
464464

465465
// Copy the font family name
466-
if (StringCchCopy(lf.lfFaceName, LF_FACESIZE, *t_fname_wstr) != S_OK)
466+
if (StringCchCopyW(lf.lfFaceName, LF_FACESIZE, *t_fname_wstr) != S_OK)
467467
return false;
468468

469469
EnumFontFamiliesExW(hdc, &lf, (FONTENUMPROCW)fontsizes_FontFamProc, (LPARAM)&context, 0);

‎engine/src/w32icon.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ void MCScreenDC::configurestatusicon(uint32_t p_icon_id, MCStringRef p_menu, MCS
434434
/* UNCHECKED */ t_tooltip_wstr.Lock(p_tooltip);
435435

436436
if (p_tooltip != nil && !MCStringIsEmpty(p_tooltip))
437-
/* UNCHECKED */ StringCchCopy(t_nidata.szTip, 128, *t_tooltip_wstr);
437+
/* UNCHECKED */ StringCchCopyW(t_nidata.szTip, 128, *t_tooltip_wstr);
438438
else
439439
t_nidata . szTip[0] = '\0';
440440

‎prebuilt/libcurl.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
{
5959
'library_dirs':
6060
[
61-
'lib/win/<(target_arch)'
61+
'lib/win32/i386'
6262
],
6363

6464
'libraries':

‎prebuilt/libicu.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
{
103103
'library_dirs':
104104
[
105-
'lib/win/<(target_arch)'
105+
'lib/win32/i386'
106106
],
107107

108108
'libraries':

0 commit comments

Comments
 (0)