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

Commit d74e370

Browse files
author
Fraser Gordon
committed
Merge pull request #2 from runrev/projectfiles-win32
Projectfiles win32
2 parents bde5cfd + 3819431 commit d74e370

File tree

13 files changed

+385
-11
lines changed

13 files changed

+385
-11
lines changed

engine/engine.vcproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,10 @@
209209
ReferencedProjectIdentifier="{0491E47C-B996-4DBF-8D26-C88263DF6176}"
210210
RelativePathToProject=".\engine\kernel-development.vcproj"
211211
/>
212+
<ProjectReference
213+
ReferencedProjectIdentifier="{25CCFCBE-CCB2-44FC-A4FB-F46990F4383A}"
214+
RelativePathToProject=".\thirdparty\libffi\libffi.vcproj"
215+
/>
212216
</References>
213217
<Files>
214218
<Filter

engine/kernel.vcproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
/>
3939
<Tool
4040
Name="VCCLCompilerTool"
41-
AdditionalIncludeDirectories="&quot;$(ProgramFiles)\QuickTime SDK\CIncludes&quot;"
41+
AdditionalIncludeDirectories="&quot;$(SolutionDir)libscript\include&quot;;&quot;$(ProgramFiles)\QuickTime SDK\CIncludes&quot;"
4242
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
4343
MinimalRebuild="true"
4444
BasicRuntimeChecks="3"
@@ -98,7 +98,7 @@
9898
/>
9999
<Tool
100100
Name="VCCLCompilerTool"
101-
AdditionalIncludeDirectories="&quot;$(ProgramFiles)\QuickTime SDK\CIncludes&quot;"
101+
AdditionalIncludeDirectories="&quot;$(SolutionDir)libscript\include&quot;;&quot;$(ProgramFiles)\QuickTime SDK\CIncludes&quot;"
102102
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
103103
UsePrecompiledHeader="2"
104104
PrecompiledHeaderThrough="prefix.h"
@@ -166,6 +166,10 @@
166166
ReferencedProjectIdentifier="{F9B1E2E6-8FD9-48C2-8D5C-9900865E7096}"
167167
RelativePathToProject=".\libgraphics\libgraphics.vcproj"
168168
/>
169+
<ProjectReference
170+
ReferencedProjectIdentifier="{E82DA459-E7D9-4D1A-96D1-F7EE03FC0BB1}"
171+
RelativePathToProject=".\libscript\libscript.vcproj"
172+
/>
169173
</References>
170174
<Files>
171175
<Filter

libfoundation/libfoundation.vcproj

Lines changed: 66 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)prebuilt\include&quot;;&quot;$(SolutionDir)thirdparty\libffi\win32&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)prebuilt\include&quot;;&quot;$(SolutionDir)thirdparty\libffi\win32&quot;"
101101
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
102102
UsePrecompiledHeader="0"
103103
DebugInformationFormat="3"
@@ -132,6 +132,10 @@
132132
</Configuration>
133133
</Configurations>
134134
<References>
135+
<ProjectReference
136+
ReferencedProjectIdentifier="{25CCFCBE-CCB2-44FC-A4FB-F46990F4383A}"
137+
RelativePathToProject=".\thirdparty\libffi\libffi.vcproj"
138+
/>
135139
</References>
136140
<Files>
137141
<Filter
@@ -147,6 +151,10 @@
147151
RelativePath=".\src\foundation-bidi.cpp"
148152
>
149153
</File>
154+
<File
155+
RelativePath=".\src\foundation-chunk.cpp"
156+
>
157+
</File>
150158
<File
151159
RelativePath=".\src\foundation-core.cpp"
152160
>
@@ -163,6 +171,18 @@
163171
RelativePath=".\src\foundation-error.cpp"
164172
>
165173
</File>
174+
<File
175+
RelativePath=".\src\foundation-filters.cpp"
176+
>
177+
</File>
178+
<File
179+
RelativePath=".\src\foundation-foreign.cpp"
180+
>
181+
</File>
182+
<File
183+
RelativePath=".\src\foundation-handler.cpp"
184+
>
185+
</File>
166186
<File
167187
RelativePath=".\src\foundation-list.cpp"
168188
>
@@ -171,6 +191,10 @@
171191
RelativePath=".\src\foundation-locale.cpp"
172192
>
173193
</File>
194+
<File
195+
RelativePath=".\src\foundation-math.cpp"
196+
>
197+
</File>
174198
<File
175199
RelativePath=".\src\foundation-name.cpp"
176200
>
@@ -183,10 +207,22 @@
183207
RelativePath=".\src\foundation-number.cpp"
184208
>
185209
</File>
210+
<File
211+
RelativePath=".\src\foundation-pickle.cpp"
212+
>
213+
</File>
186214
<File
187215
RelativePath=".\src\foundation-private.h"
188216
>
189217
</File>
218+
<File
219+
RelativePath=".\src\foundation-proper-list.cpp"
220+
>
221+
</File>
222+
<File
223+
RelativePath=".\src\foundation-record.cpp"
224+
>
225+
</File>
190226
<File
191227
RelativePath=".\src\foundation-set.cpp"
192228
>
@@ -203,6 +239,14 @@
203239
RelativePath=".\src\foundation-text.cpp"
204240
>
205241
</File>
242+
<File
243+
RelativePath=".\src\foundation-typeconvert.cpp"
244+
>
245+
</File>
246+
<File
247+
RelativePath=".\src\foundation-typeinfo.cpp"
248+
>
249+
</File>
206250
<File
207251
RelativePath=".\src\foundation-unicode-private.h"
208252
>
@@ -233,6 +277,14 @@
233277
RelativePath=".\include\foundation-bidi.h"
234278
>
235279
</File>
280+
<File
281+
RelativePath=".\include\foundation-chunk.h"
282+
>
283+
</File>
284+
<File
285+
RelativePath=".\include\foundation-filters.h"
286+
>
287+
</File>
236288
<File
237289
RelativePath=".\include\foundation-inline.h"
238290
>
@@ -241,10 +293,22 @@
241293
RelativePath=".\include\foundation-locale.h"
242294
>
243295
</File>
296+
<File
297+
RelativePath=".\include\foundation-math.h"
298+
>
299+
</File>
300+
<File
301+
RelativePath=".\include\foundation-objc.h"
302+
>
303+
</File>
244304
<File
245305
RelativePath=".\include\foundation-stdlib.h"
246306
>
247307
</File>
308+
<File
309+
RelativePath=".\include\foundation-string.h"
310+
>
311+
</File>
248312
<File
249313
RelativePath=".\include\foundation-text.h"
250314
>

libfoundation/src/foundation-error.cpp

100644100755
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
1919

2020
#include "foundation-private.h"
2121

22+
#include <stdlib.h>
23+
2224
////////////////////////////////////////////////////////////////////////////////
2325

2426
MCTypeInfoRef kMCOutOfMemoryErrorTypeInfo;

0 commit comments

Comments
 (0)