Skip to content

Commit 715e222

Browse files
author
Fraser J. Gordon
committed
Plumb libffi into libfoundation building for Win32
1 parent 02c6fb4 commit 715e222

4 files changed

Lines changed: 83 additions & 7 deletions

File tree

‎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;

‎stage.sln‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "revvideograbber", "revvideo
5757
EndProject
5858
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "engine\kernel.vcproj", "{36960D7E-AD16-47BB-BA13-3770A224EC41}"
5959
ProjectSection(ProjectDependencies) = postProject
60-
{0FC47D0C-58FE-41D6-A473-E7AFFA33CEEE} = {0FC47D0C-58FE-41D6-A473-E7AFFA33CEEE}
61-
{6DE03F12-1D0B-4B70-A6C2-939EFF044931} = {6DE03F12-1D0B-4B70-A6C2-939EFF044931}
62-
{81FB1E54-0DBF-4D7D-92F5-A7774E531CE2} = {81FB1E54-0DBF-4D7D-92F5-A7774E531CE2}
63-
{09791ABE-810B-4424-B3CE-F7FEDA2299DE} = {09791ABE-810B-4424-B3CE-F7FEDA2299DE}
6460
{E6239DF5-EDC5-4B5F-8848-98DC19299D4B} = {E6239DF5-EDC5-4B5F-8848-98DC19299D4B}
61+
{09791ABE-810B-4424-B3CE-F7FEDA2299DE} = {09791ABE-810B-4424-B3CE-F7FEDA2299DE}
62+
{81FB1E54-0DBF-4D7D-92F5-A7774E531CE2} = {81FB1E54-0DBF-4D7D-92F5-A7774E531CE2}
63+
{6DE03F12-1D0B-4B70-A6C2-939EFF044931} = {6DE03F12-1D0B-4B70-A6C2-939EFF044931}
64+
{0FC47D0C-58FE-41D6-A473-E7AFFA33CEEE} = {0FC47D0C-58FE-41D6-A473-E7AFFA33CEEE}
6565
EndProjectSection
6666
EndProject
6767
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcairo", "thirdparty\libcairo\libcairo.vcproj", "{5F1837C3-649E-4F70-B157-243BF819D1F8}"
@@ -91,6 +91,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel-standalone", "engine
9191
EndProjectSection
9292
EndProject
9393
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfoundation", "libfoundation\libfoundation.vcproj", "{8862ADC2-BEB0-4765-A1E4-0E3493718999}"
94+
ProjectSection(ProjectDependencies) = postProject
95+
{25CCFCBE-CCB2-44FC-A4FB-F46990F4383A} = {25CCFCBE-CCB2-44FC-A4FB-F46990F4383A}
96+
EndProjectSection
9497
EndProject
9598
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgraphics", "libgraphics\libgraphics.vcproj", "{F9B1E2E6-8FD9-48C2-8D5C-9900865E7096}"
9699
ProjectSection(ProjectDependencies) = postProject
@@ -102,6 +105,7 @@ EndProject
102105
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcore", "libcore\libcore.vcproj", "{6899CD7E-BE16-44CE-A28B-27304F42E127}"
103106
EndProject
104107
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt", "thirdparty\libxslt\libxslt.vcproj", "{8E776621-28FF-4FBF-A2F3-F4598AEAF8B7}"
108+
EndProject
105109
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lcidlc", "lcidlc\lcidlc.vcproj", "{7321A225-FAC4-45D6-BAE4-B0E943102B7E}"
106110
EndProject
107111
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "revtestexternal", "revtestexternal\revtestexternal.vcproj", "{2C0F855E-2EA0-4F46-9660-3C47D673B8B8}"
@@ -112,6 +116,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "revbrowser-cefprocess", "re
112116
EndProject
113117
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcef_stubs", "thirdparty\libcef\libcef.vcproj", "{58314BC9-A2EE-49F0-8B40-7BA12517A60C}"
114118
EndProject
119+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libffi", "thirdparty\libffi\libffi.vcproj", "{25CCFCBE-CCB2-44FC-A4FB-F46990F4383A}"
120+
EndProject
115121
Global
116122
GlobalSection(SolutionConfigurationPlatforms) = preSolution
117123
Debug|Win32 = Debug|Win32
@@ -294,6 +300,10 @@ Global
294300
{58314BC9-A2EE-49F0-8B40-7BA12517A60C}.Debug|Win32.Build.0 = Debug|Win32
295301
{58314BC9-A2EE-49F0-8B40-7BA12517A60C}.Release|Win32.ActiveCfg = Release|Win32
296302
{58314BC9-A2EE-49F0-8B40-7BA12517A60C}.Release|Win32.Build.0 = Release|Win32
303+
{25CCFCBE-CCB2-44FC-A4FB-F46990F4383A}.Debug|Win32.ActiveCfg = Debug|Win32
304+
{25CCFCBE-CCB2-44FC-A4FB-F46990F4383A}.Debug|Win32.Build.0 = Debug|Win32
305+
{25CCFCBE-CCB2-44FC-A4FB-F46990F4383A}.Release|Win32.ActiveCfg = Release|Win32
306+
{25CCFCBE-CCB2-44FC-A4FB-F46990F4383A}.Release|Win32.Build.0 = Release|Win32
297307
EndGlobalSection
298308
GlobalSection(SolutionProperties) = preSolution
299309
HideSolutionNode = FALSE

‎thirdparty‎

0 commit comments

Comments
 (0)