Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 35adebe

Browse files
livecodeianlivecodeian
committed
[[ WindowsPlayer ]] Add new sources to build config files and reorganise exclusions to allow Win32 builds to include required MCPlatform sources
1 parent 8e004e1 commit 35adebe

File tree

5 files changed

+1720
-19
lines changed

5 files changed

+1720
-19
lines changed

‎engine/engine-sources.gypi‎

Lines changed: 38 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,9 @@
275275
'src/paragrafattr.cpp',
276276
'src/parentscript.cpp',
277277
'src/pickle.cpp',
278+
'src/player.cpp',
278279
'src/player-legacy.cpp',
279280
'src/player-platform.cpp',
280-
'src/player.cpp',
281281
'src/props.cpp',
282282
'src/rtf.cpp',
283283
'src/rtfsupport.cpp',
@@ -722,6 +722,7 @@
722722
'src/w32icon.cpp',
723723
'src/w32image.cpp',
724724
'src/w32misc.cpp',
725+
'src/w32-ds-player.cpp',
725726
'src/w32prefix.cpp',
726727
'src/w32printer.cpp',
727728
'src/w32relaunch.cpp',
@@ -731,6 +732,7 @@
731732
'src/w32text.cpp',
732733
'src/w32textlayout.cpp',
733734
'src/w32theme.cpp',
735+
'src/w32-core-compat.cpp',
734736

735737
# Group "Desktop - Emscripten"
736738
'src/em-async.h',
@@ -856,6 +858,7 @@
856858
'src/srvspec.cpp',
857859
'src/srvstack.cpp',
858860
'src/native-layer-srv.cpp',
861+
'src/player-srv-stubs.cpp',
859862
],
860863

861864
# Java sources for Android
@@ -935,6 +938,7 @@
935938
'engine_server_exclude_files':
936939
[
937940
'src/player-platform.cpp',
941+
'src/player-legacy.cpp',
938942
'src/stacke.cpp',
939943
],
940944

@@ -1099,8 +1103,17 @@
10991103
'sources!':
11001104
[
11011105
'src/fiber.cpp',
1102-
'src/player-platform.cpp',
11031106
'src/tilecachegl.cpp',
1107+
'src/player-legacy.cpp',
1108+
1109+
'src/desktop-ans.cpp',
1110+
'src/desktop-dc.cpp',
1111+
'src/desktop-image.cpp',
1112+
'src/desktop-menu.cpp',
1113+
'src/desktop-stack.cpp',
1114+
'src/platform-recorder.cpp',
1115+
'src/platform-surface.cpp',
1116+
'src/platform-window.cpp',
11041117
],
11051118
},
11061119
],
@@ -1119,22 +1132,6 @@
11191132
'src/srvflst.cpp',
11201133
],
11211134
},
1122-
{
1123-
'sources!':
1124-
[
1125-
1126-
'src/desktop.cpp',
1127-
'src/desktop-ans.cpp',
1128-
'src/desktop-dc.cpp',
1129-
'src/desktop-image.cpp',
1130-
'src/desktop-menu.cpp',
1131-
'src/desktop-stack.cpp',
1132-
'src/platform.cpp',
1133-
'src/platform-recorder.cpp',
1134-
'src/platform-surface.cpp',
1135-
'src/platform-window.cpp',
1136-
],
1137-
},
11381135
],
11391136
[
11401137
'OS == "mac" and target_sdk=="macosx10.6"',
@@ -1163,7 +1160,18 @@
11631160
[
11641161
'src/player-platform.cpp',
11651162
'src/tilecachegl.cpp',
1166-
]
1163+
1164+
'src/desktop.cpp',
1165+
'src/desktop-ans.cpp',
1166+
'src/desktop-dc.cpp',
1167+
'src/desktop-image.cpp',
1168+
'src/desktop-menu.cpp',
1169+
'src/desktop-stack.cpp',
1170+
'src/platform.cpp',
1171+
'src/platform-recorder.cpp',
1172+
'src/platform-surface.cpp',
1173+
'src/platform-window.cpp',
1174+
],
11671175
},
11681176
],
11691177
[
@@ -1209,6 +1217,17 @@
12091217
'src/notify.cpp',
12101218
'src/player-platform.cpp',
12111219
'src/tilecachegl.cpp',
1220+
1221+
'src/desktop.cpp',
1222+
'src/desktop-ans.cpp',
1223+
'src/desktop-dc.cpp',
1224+
'src/desktop-image.cpp',
1225+
'src/desktop-menu.cpp',
1226+
'src/desktop-stack.cpp',
1227+
'src/platform.cpp',
1228+
'src/platform-recorder.cpp',
1229+
'src/platform-surface.cpp',
1230+
'src/platform-window.cpp',
12121231
],
12131232
},
12141233
],

‎engine/kernel.gyp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@
262262
'-lrpcrt4',
263263
'-lshell32',
264264
'-lshlwapi',
265+
'-lstrmiids',
265266
'-luser32',
266267
'-lusp10',
267268
'-lwinmm',

0 commit comments

Comments
 (0)