Skip to content

Commit 9f2cbd4

Browse files
author
Monte Goulding
committed
Fixed a couple of issues with InterfaceGenerate wile trying to see if I can use lcidl based externals on Win
1 parent ebe1afe commit 9f2cbd4

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

‎lcidlc/lcidlc.vcproj‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,10 @@
167167
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
168168
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
169169
>
170+
<File
171+
RelativePath=".\src\Coder.cpp"
172+
>
173+
</File>
170174
<File
171175
RelativePath=".\src\Error.cpp"
172176
>
@@ -209,6 +213,10 @@
209213
Filter="h;hpp;hxx;hm;inl;inc;xsd"
210214
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
211215
>
216+
<File
217+
RelativePath=".\src\Coder.h"
218+
>
219+
</File>
212220
<File
213221
RelativePath=".\src\Error.h"
214222
>
@@ -272,7 +280,7 @@
272280
>
273281
<Tool
274282
Name="VCCustomBuildTool"
275-
CommandLine="&quot;$(SolutionDir)prebuilt\bin\Revolution.exe&quot; &quot;$(ProjectDir)encode_source.rev&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)EncodedJavaSupport.c&quot; &quot;g_java_support_template&quot;"
283+
CommandLine="&quot;$(SolutionDir)prebuilt\bin\Revolution.exe&quot; &quot;$(ProjectDir)encode_source.rev&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)EncodedJavaSupport.c&quot; &quot;g_java_support_template&quot;&#x0D;&#x0A;"
276284
Outputs="$(InputDir)EncodedJavaSupport.c"
277285
/>
278286
</FileConfiguration>
@@ -281,7 +289,7 @@
281289
>
282290
<Tool
283291
Name="VCCustomBuildTool"
284-
CommandLine="&quot;$(SolutionDir)prebuilt\bin\Revolution.exe&quot; &quot;$(ProjectDir)encode_source.rev&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)EncodedJavaSupport.c&quot; &quot;g_java_support_template&quot;"
292+
CommandLine="&quot;$(SolutionDir)prebuilt\bin\Revolution.exe&quot; &quot;$(ProjectDir)encode_source.rev&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)EncodedJavaSupport.c&quot; &quot;g_java_support_template&quot;&#x0D;&#x0A;"
285293
Outputs="$(InputDir)EncodedJavaSupport.c"
286294
/>
287295
</FileConfiguration>
@@ -294,7 +302,7 @@
294302
>
295303
<Tool
296304
Name="VCCustomBuildTool"
297-
CommandLine="&quot;$(SolutionDir)prebuilt\bin\Revolution.exe&quot; &quot;$(ProjectDir)encode_source.rev&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)EncodedSupport.c&quot; &quot;g_support_template&quot;"
305+
CommandLine="&quot;$(SolutionDir)prebuilt\bin\Revolution.exe&quot; &quot;$(ProjectDir)encode_source.rev&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)EncodedSupport.c&quot; &quot;g_support_template&quot;&#x0D;&#x0A;"
298306
Outputs="$(InputDir)EncodedSupport.c"
299307
/>
300308
</FileConfiguration>
@@ -303,7 +311,7 @@
303311
>
304312
<Tool
305313
Name="VCCustomBuildTool"
306-
CommandLine="&quot;$(SolutionDir)prebuilt\bin\Revolution.exe&quot; &quot;$(ProjectDir)encode_source.rev&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)EncodedSupport.c&quot; &quot;g_support_template&quot;"
314+
CommandLine="&quot;$(SolutionDir)prebuilt\bin\Revolution.exe&quot; &quot;$(ProjectDir)encode_source.rev&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)EncodedSupport.c&quot; &quot;g_support_template&quot;&#x0D;&#x0A;"
307315
Outputs="$(InputDir)EncodedSupport.c"
308316
/>
309317
</FileConfiguration>

‎lcidlc/src/InterfaceGenerate.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,7 +1088,7 @@ static void map_parameter(InterfaceRef self, HandlerMapping p_mapping, HandlerPa
10881088
r_param . is_optional = p_parameter -> is_optional;
10891089
}
10901090

1091-
static bool InterfaceGenerateVariant(InterfaceRef self, CoderRef p_coder, Handler *p_handler, HandlerVariant *p_variant, HandlerMapping p_mapping)
1091+
static void InterfaceGenerateVariant(InterfaceRef self, CoderRef p_coder, Handler *p_handler, HandlerVariant *p_variant, HandlerMapping p_mapping)
10921092
{
10931093
Handler *t_handler;
10941094
t_handler = p_handler;
@@ -1458,7 +1458,7 @@ static bool InterfaceGenerateHandlers(InterfaceRef self, CoderRef p_coder)
14581458

14591459
CoderWriteLine(p_coder, "static bool handler__%s(MCVariableRef *argv, uint32_t argc, MCVariableRef result)", NameGetCString(t_handler -> name));
14601460
CoderWriteLine(p_coder, "{");
1461-
CoderWriteLine(p_coder, "\thandler__%s_env_t env;");
1461+
CoderWriteLine(p_coder, "\thandler__%s_env_t env;", NameGetCString(t_handler -> name));
14621462
CoderWriteLine(p_coder, "\tenv . argv = argv;");
14631463
CoderWriteLine(p_coder, "\tenv . argc = argc;");
14641464
CoderWriteLine(p_coder, "\tenv . result = result;");

‎revtestexternal/revtestexternal.vcproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
/>
3939
<Tool
4040
Name="VCCLCompilerTool"
41+
AdditionalOptions="/I &quot;C:\livecode\lcidlc\include&quot;"
4142
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;REVTESTEXTERNAL_EXPORTS"
4243
MinimalRebuild="true"
4344
BasicRuntimeChecks="3"
@@ -200,7 +201,7 @@
200201
>
201202
<Tool
202203
Name="VCCustomBuildTool"
203-
CommandLine="&quot;$(OutDir)\lcidlc.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputPath).cpp&quot;"
204+
CommandLine="&quot;$(OutDir)\lcidlc.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputPath).cpp&quot;&#x0D;&#x0A;"
204205
AdditionalDependencies="$(OutDir)lcidlc.exe"
205206
Outputs="$(InputPath).cpp"
206207
/>
@@ -210,7 +211,7 @@
210211
>
211212
<Tool
212213
Name="VCCustomBuildTool"
213-
CommandLine="&quot;$(OutDir)\lcidlc.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputPath).cpp&quot;"
214+
CommandLine="&quot;$(OutDir)\lcidlc.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputPath).cpp&quot;&#x0D;&#x0A;"
214215
AdditionalDependencies="$(OutDir)lcidlc.exe"
215216
Outputs="$(InputPath).cpp"
216217
/>

0 commit comments

Comments
 (0)