Skip to content

Commit 116ac13

Browse files
author
Fraser J. Gordon
committed
Get Windows server building
1 parent 9eae5d6 commit 116ac13

9 files changed

Lines changed: 226 additions & 134 deletions

File tree

‎engine/kernel-server.vcproj‎

Lines changed: 92 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
/>
3939
<Tool
4040
Name="VCCLCompilerTool"
41+
AdditionalIncludeDirectories="$(SolutionDir)libscript\include"
4142
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
4243
MinimalRebuild="true"
4344
BasicRuntimeChecks="3"
@@ -96,6 +97,7 @@
9697
/>
9798
<Tool
9899
Name="VCCLCompilerTool"
100+
AdditionalIncludeDirectories="$(SolutionDir)libscript\include"
99101
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
100102
UsePrecompiledHeader="0"
101103
DebugInformationFormat="3"
@@ -1367,6 +1369,22 @@
13671369
RelativePath=".\src\vclip.h"
13681370
>
13691371
</File>
1372+
<File
1373+
RelativePath=".\src\widget-events.cpp"
1374+
>
1375+
</File>
1376+
<File
1377+
RelativePath=".\src\widget-events.h"
1378+
>
1379+
</File>
1380+
<File
1381+
RelativePath=".\src\widget.cpp"
1382+
>
1383+
</File>
1384+
<File
1385+
RelativePath=".\src\widget.h"
1386+
>
1387+
</File>
13701388
<File
13711389
RelativePath=".\src\window.h"
13721390
>
@@ -1376,13 +1394,13 @@
13761394
Name="System"
13771395
>
13781396
<File
1379-
RelativePath=".\src\quicktime.cpp"
1380-
>
1381-
</File>
1382-
<File
13831397
RelativePath=".\src\dskw32.cpp"
13841398
>
13851399
</File>
1400+
<File
1401+
RelativePath=".\src\quicktime.cpp"
1402+
>
1403+
</File>
13861404
<File
13871405
RelativePath=".\src\sysdefs.h"
13881406
>
@@ -1407,10 +1425,6 @@
14071425
RelativePath=".\src\sysw32network.cpp"
14081426
>
14091427
</File>
1410-
<File
1411-
RelativePath=".\src\sysw32random.cpp"
1412-
>
1413-
</File>
14141428
<File
14151429
RelativePath=".\src\sysw32registry.cpp"
14161430
>
@@ -1427,6 +1441,10 @@
14271441
RelativePath=".\src\w32prefix.cpp"
14281442
>
14291443
</File>
1444+
<File
1445+
RelativePath=".\src\windows-theme.cpp"
1446+
>
1447+
</File>
14301448
</Filter>
14311449
<Filter
14321450
Name="Variant - Server"
@@ -1691,6 +1709,10 @@
16911709
RelativePath=".\src\exec-engine.cpp"
16921710
>
16931711
</File>
1712+
<File
1713+
RelativePath=".\src\exec-extension.cpp"
1714+
>
1715+
</File>
16941716
<File
16951717
RelativePath=".\src\exec-files.cpp"
16961718
>
@@ -2004,6 +2026,68 @@
20042026
>
20052027
</File>
20062028
</Filter>
2029+
<Filter
2030+
Name="Modules"
2031+
>
2032+
<File
2033+
RelativePath=".\src\module-canvas-internal.h"
2034+
>
2035+
</File>
2036+
<File
2037+
RelativePath=".\src\module-canvas.cpp"
2038+
>
2039+
</File>
2040+
<File
2041+
RelativePath=".\src\module-canvas.h"
2042+
>
2043+
</File>
2044+
<File
2045+
RelativePath=".\src\module-engine.cpp"
2046+
>
2047+
</File>
2048+
<File
2049+
RelativePath=".\src\module-engine.h"
2050+
>
2051+
</File>
2052+
<File
2053+
RelativePath="..\toolchain\lc-compile\src\module-helper.cpp"
2054+
>
2055+
</File>
2056+
<Filter
2057+
Name="Generated"
2058+
>
2059+
<File
2060+
RelativePath=".\src\_mlc\canvas.c"
2061+
>
2062+
</File>
2063+
<File
2064+
RelativePath=".\src\_mlc\engine.c"
2065+
>
2066+
</File>
2067+
<File
2068+
RelativePath=".\src\_mlc\widget.c"
2069+
>
2070+
<FileConfiguration
2071+
Name="Debug|Win32"
2072+
>
2073+
<Tool
2074+
Name="VCCLCompilerTool"
2075+
ObjectFile="$(IntDir)\$(InputName)1.obj"
2076+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
2077+
/>
2078+
</FileConfiguration>
2079+
<FileConfiguration
2080+
Name="Release|Win32"
2081+
>
2082+
<Tool
2083+
Name="VCCLCompilerTool"
2084+
ObjectFile="$(IntDir)\$(InputName)1.obj"
2085+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
2086+
/>
2087+
</FileConfiguration>
2088+
</File>
2089+
</Filter>
2090+
</Filter>
20072091
<File
20082092
RelativePath=".\encode_errors.rev"
20092093
>

‎engine/server.vcproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,18 @@
272272
ReferencedProjectIdentifier="{BFB6C63F-C119-45D6-96EB-23D717727D58}"
273273
RelativePathToProject=".\engine\kernel-server.vcproj"
274274
/>
275+
<ProjectReference
276+
ReferencedProjectIdentifier="{E82DA459-E7D9-4D1A-96D1-F7EE03FC0BB1}"
277+
RelativePathToProject=".\libscript\libscript.vcproj"
278+
/>
279+
<ProjectReference
280+
ReferencedProjectIdentifier="{56CD2637-6005-4DD6-9ADF-F85C7774BB88}"
281+
RelativePathToProject=".\libscript\stdscript.vcproj"
282+
/>
283+
<ProjectReference
284+
ReferencedProjectIdentifier="{25CCFCBE-CCB2-44FC-A4FB-F46990F4383A}"
285+
RelativePathToProject=".\thirdparty\libffi\libffi.vcproj"
286+
/>
275287
</References>
276288
<Files>
277289
<Filter

‎engine/src/modules.cpp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,19 @@ extern "C"
2929
extern builtin_module_descriptor __com_livecode_bitwise_module_info;
3030
extern builtin_module_descriptor __com_livecode_byte_module_info;
3131
extern builtin_module_descriptor __com_livecode_char_module_info;
32+
extern builtin_module_descriptor __com_livecode_date_module_info;
3233
extern builtin_module_descriptor __com_livecode_encoding_module_info;
34+
extern builtin_module_descriptor __com_livecode_file_module_info;
3335
extern builtin_module_descriptor __com_livecode_item_module_info;
3436
extern builtin_module_descriptor __com_livecode_line_module_info;
3537
extern builtin_module_descriptor __com_livecode_list_module_info;
3638
extern builtin_module_descriptor __com_livecode_logic_module_info;
3739
extern builtin_module_descriptor __com_livecode_math_module_info;
3840
extern builtin_module_descriptor __com_livecode_segmentchunk_module_info;
3941
extern builtin_module_descriptor __com_livecode_sort_module_info;
42+
extern builtin_module_descriptor __com_livecode_stream_module_info;
4043
extern builtin_module_descriptor __com_livecode_string_module_info;
44+
extern builtin_module_descriptor __com_livecode_system_module_info;
4145
extern builtin_module_descriptor __com_livecode_type_module_info;
4246
extern builtin_module_descriptor __com_livecode_typeconvert_module_info;
4347
extern builtin_module_descriptor __com_livecode_mathfoundation_module_info;
@@ -53,14 +57,17 @@ extern "C"
5357
&__com_livecode_bitwise_module_info,
5458
&__com_livecode_byte_module_info,
5559
&__com_livecode_char_module_info,
60+
&__com_livecode_date_module_info,
5661
//&__com_livecode_encoding_module_info,
62+
&__com_livecode_file_module_info,
5763
//&__com_livecode_item_module_info,
5864
//&__com_livecode_line_module_info,
5965
&__com_livecode_list_module_info,
6066
&__com_livecode_logic_module_info,
6167
&__com_livecode_math_module_info,
6268
//&__com_livecode_segmentchunk_module_info,
6369
&__com_livecode_sort_module_info,
70+
&__com_livecode_stream_module_info,
6471
&__com_livecode_string_module_info,
6572
&__com_livecode_type_module_info,
6673
&__com_livecode_typeconvert_module_info,
@@ -78,10 +85,13 @@ extern "C"
7885
extern void (*MCBitwiseEvalBitwiseAnd)();
7986
extern void (*MCByteEvalNumberOfBytesIn)();
8087
extern void (*MCCharEvalNumberOfCharsIn)();
88+
extern void (*MCDateExecGetLocalTime)();
89+
extern void (*MCFileExecGetContents)();
8190
extern void (*MCListEvalHeadOf)();
8291
extern void (*MCLogicEvalNot)();
8392
extern void (*MCMathEvalRealToPowerOfReal)();
8493
extern void (*MCSortExecSortListAscendingText)();
94+
extern void (*MCStreamExecWriteToStream)();
8595
extern void (*MCStringEvalConcatenate)();
8696
extern void (*MCTypeEvalIsDefined)();
8797
extern void (*MCTypeConvertExecSplitStringByDelimiter)();
@@ -99,10 +109,13 @@ extern "C"
99109
&MCBitwiseEvalBitwiseAnd,
100110
&MCByteEvalNumberOfBytesIn,
101111
&MCCharEvalNumberOfCharsIn,
112+
&MCDateExecGetLocalTime,
113+
&MCFileExecGetContents,
102114
&MCListEvalHeadOf,
103115
&MCLogicEvalNot,
104116
&MCMathEvalRealToPowerOfReal,
105117
&MCSortExecSortListAscendingText,
118+
&MCStreamExecWriteToStream,
106119
&MCStringEvalConcatenate,
107120
&MCTypeEvalIsDefined,
108121
&MCTypeConvertExecSplitStringByDelimiter,

‎libfoundation/libfoundation-server.vcproj‎

Lines changed: 70 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
/>
3939
<Tool
4040
Name="VCCLCompilerTool"
41-
AdditionalIncludeDirectories="&quot;$(SolutionDir)prebuilt\include&quot;"
41+
AdditionalIncludeDirectories="&quot;$(SolutionDir)thirdparty\libffi\win32&quot;;&quot;$(SolutionDir)prebuilt\include&quot;"
4242
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
4343
MinimalRebuild="true"
4444
BasicRuntimeChecks="3"
@@ -97,7 +97,7 @@
9797
/>
9898
<Tool
9999
Name="VCCLCompilerTool"
100-
AdditionalIncludeDirectories="&quot;$(SolutionDir)prebuilt\include&quot;"
100+
AdditionalIncludeDirectories="&quot;$(SolutionDir)thirdparty\libffi\win32&quot;;&quot;$(SolutionDir)prebuilt\include&quot;"
101101
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
102102
UsePrecompiledHeader="0"
103103
DebugInformationFormat="3"
@@ -147,10 +147,18 @@
147147
RelativePath=".\src\foundation-bidi.cpp"
148148
>
149149
</File>
150+
<File
151+
RelativePath=".\src\foundation-chunk.cpp"
152+
>
153+
</File>
150154
<File
151155
RelativePath=".\src\foundation-core.cpp"
152156
>
153157
</File>
158+
<File
159+
RelativePath=".\src\foundation-custom.cpp"
160+
>
161+
</File>
154162
<File
155163
RelativePath=".\src\foundation-data.cpp"
156164
>
@@ -163,6 +171,30 @@
163171
RelativePath=".\src\foundation-error.cpp"
164172
>
165173
</File>
174+
<File
175+
RelativePath=".\src\foundation-file-private.h"
176+
>
177+
</File>
178+
<File
179+
RelativePath=".\src\foundation-file-w32.cpp"
180+
>
181+
</File>
182+
<File
183+
RelativePath=".\src\foundation-file.cpp"
184+
>
185+
</File>
186+
<File
187+
RelativePath=".\src\foundation-filters.cpp"
188+
>
189+
</File>
190+
<File
191+
RelativePath=".\src\foundation-foreign.cpp"
192+
>
193+
</File>
194+
<File
195+
RelativePath=".\src\foundation-handler.cpp"
196+
>
197+
</File>
166198
<File
167199
RelativePath=".\src\foundation-list.cpp"
168200
>
@@ -171,6 +203,10 @@
171203
RelativePath=".\src\foundation-locale.cpp"
172204
>
173205
</File>
206+
<File
207+
RelativePath=".\src\foundation-math.cpp"
208+
>
209+
</File>
174210
<File
175211
RelativePath=".\src\foundation-name.cpp"
176212
>
@@ -183,14 +219,34 @@
183219
RelativePath=".\src\foundation-number.cpp"
184220
>
185221
</File>
222+
<File
223+
RelativePath=".\src\foundation-pickle.cpp"
224+
>
225+
</File>
186226
<File
187227
RelativePath=".\src\foundation-private.h"
188228
>
189229
</File>
230+
<File
231+
RelativePath=".\src\foundation-proper-list.cpp"
232+
>
233+
</File>
234+
<File
235+
RelativePath=".\src\foundation-random.cpp"
236+
>
237+
</File>
238+
<File
239+
RelativePath=".\src\foundation-record.cpp"
240+
>
241+
</File>
190242
<File
191243
RelativePath=".\src\foundation-set.cpp"
192244
>
193245
</File>
246+
<File
247+
RelativePath=".\src\foundation-stream-stdio.cpp"
248+
>
249+
</File>
194250
<File
195251
RelativePath=".\src\foundation-stream.cpp"
196252
>
@@ -203,6 +259,18 @@
203259
RelativePath=".\src\foundation-text.cpp"
204260
>
205261
</File>
262+
<File
263+
RelativePath=".\src\foundation-typeconvert.cpp"
264+
>
265+
</File>
266+
<File
267+
RelativePath=".\src\foundation-typeinfo.cpp"
268+
>
269+
</File>
270+
<File
271+
RelativePath=".\src\foundation-unicode-private.h"
272+
>
273+
</File>
206274
<File
207275
RelativePath=".\src\foundation-unicode.cpp"
208276
>

‎libfoundation/src/foundation-string.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ bool MCStringFormatV(MCStringRef& r_string, const char *p_format, va_list p_args
698698
{
699699
memcpy(t_format, t_format_start_ptr, t_format_size);
700700
t_format[t_format_size] = '\0';
701-
#ifdef _WINDOWS
701+
#if defined(_WINDOWS) || defined(_WINDOWS_SERVER)
702702
t_success = MCNativeCharsFormatV(t_string, t_size, t_format, p_args);
703703
#else
704704
va_list t_args;

‎libscript/src/module-date.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
2323
/* Windows doesn't have localtime_r(), but it does have an equivalent
2424
* function with the arguments in the opposite order! */
2525
#if defined(__WINDOWS__)
26-
# define localtime_r(s,t) (_localtime_s(t,s))
26+
# define localtime_r(s,t) (localtime_s(t,s))
2727
#endif
2828

2929
extern "C" MC_DLLEXPORT void

0 commit comments

Comments
 (0)