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

Commit 727bacc

Browse files
runrevmarkrunrevmark
committed
Fixed issue with mode_development.cpp compiling.
Fixed build order dependencies. Added auto generation of revbuild.h from 'version'. Re-enabled building of revBrowser. Updated submodule references.
1 parent e9f6a77 commit 727bacc

7 files changed

Lines changed: 124 additions & 78 deletions

File tree

‎engine/encode_version.rev‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ on generate
1414

1515
local tVars
1616
put url ("file:" & $1 & "/../version") into tVars
17+
1718
repeat for each line tVar in tVars
18-
split tVar by "="
19-
replace "$" & word 1 to -1 of tVar[1] with word 1 to -1 of tVar[2] in tTemplate
19+
get tVar
20+
split it by "="
21+
replace ("$" & word 1 to -1 of it[1]) with (word 1 to -1 of it[2]) in tTemplate
2022
end repeat
2123

2224
put tTemplate into url ("binfile:" & $1 & "/include/revbuild.h")

‎engine/installer.vcproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,10 @@
246246
RelativePath=".\src\mode_installer_w32.cpp"
247247
>
248248
</File>
249+
<File
250+
RelativePath=".\src\stacksecurity.cpp"
251+
>
252+
</File>
249253
</Filter>
250254
<Filter
251255
Name="Header Files"

‎engine/kernel-development.vcproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
<Tool
216216
Name="VCCustomBuildTool"
217217
Description="Encoding error strings"
218-
CommandLine="$(SolutionDir)prebuilt\bin\Revolution.exe &quot;$(InputDir)encode_errors.rev&quot; &quot;$(InputDir)src&quot; &quot;$(InputDir)src\encodederrors.cpp&quot;"
218+
CommandLine="&quot;$(SolutionDir)prebuilt\bin\Revolution.exe&quot; &quot;$(InputDir)encode_errors.rev&quot; &quot;$(InputDir)src&quot; &quot;$(InputDir)src\encodederrors.cpp&quot;"
219219
AdditionalDependencies="$(InputDir)src\executionerrors.h;$(InputDir)src\parseerrors.h"
220220
Outputs="$(InputDir)src\encodederrors.cpp"
221221
/>
@@ -226,7 +226,7 @@
226226
<Tool
227227
Name="VCCustomBuildTool"
228228
Description="Encoding error strings"
229-
CommandLine="$(SolutionDir)prebuilt\tools\Revolution.exe &quot;$(InputDir)encode_errors.rev&quot; &quot;$(InputDir)src&quot; &quot;$(InputDir)src\encodederrors.cpp&quot;"
229+
CommandLine="&quot;$(SolutionDir)prebuilt\bin\Revolution.exe&quot; &quot;$(InputDir)encode_errors.rev&quot; &quot;$(InputDir)src&quot; &quot;$(InputDir)src\encodederrors.cpp&quot;&#x0D;&#x0A;"
230230
AdditionalDependencies="$(InputDir)src\executionerrors.h;$(InputDir)src\parseerrors.h"
231231
Outputs="$(InputDir)src\encodederrors.cpp"
232232
/>
@@ -241,7 +241,7 @@
241241
<Tool
242242
Name="VCCustomBuildTool"
243243
Description="Generating hashed strings for colorization..."
244-
CommandLine="$(SolutionDir)prebuilt\bin\Revolution.exe &quot;$(InputDir)hash_strings.rev&quot; &quot;$(InputDir)src\lextable.cpp&quot; &quot;$(InputDir)src\hashedstrings.cpp&quot;"
244+
CommandLine="&quot;$(SolutionDir)prebuilt\bin\Revolution.exe&quot; &quot;$(InputDir)hash_strings.rev&quot; &quot;$(InputDir)src\lextable.cpp&quot; &quot;$(InputDir)src\hashedstrings.cpp&quot;"
245245
AdditionalDependencies="$(InputDir)src\lextable.cpp"
246246
Outputs="$(InputDir)src\hashedstrings.cpp"
247247
/>
@@ -252,7 +252,7 @@
252252
<Tool
253253
Name="VCCustomBuildTool"
254254
Description="Generating hashed strings for colorization..."
255-
CommandLine="$(SolutionDir)prebuilt\bin\Revolution.exe &quot;$(InputDir)hash_strings.rev&quot; &quot;$(InputDir)src\lextable.cpp&quot; &quot;$(InputDir)src\hashedstrings.cpp&quot;"
255+
CommandLine="&quot;$(SolutionDir)prebuilt\bin\Revolution.exe&quot; &quot;$(InputDir)hash_strings.rev&quot; &quot;$(InputDir)src\lextable.cpp&quot; &quot;$(InputDir)src\hashedstrings.cpp&quot;"
256256
AdditionalDependencies="$(InputDir)src\lextable.cpp"
257257
Outputs="$(InputDir)src\hashedstrings.cpp"
258258
/>

‎engine/kernel.vcproj‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5459,6 +5459,32 @@
54595459
RelativePath=".\ChangeLog.txt"
54605460
>
54615461
</File>
5462+
<File
5463+
RelativePath=".\encode_version.rev"
5464+
>
5465+
<FileConfiguration
5466+
Name="Debug|Win32"
5467+
>
5468+
<Tool
5469+
Name="VCCustomBuildTool"
5470+
Description="Generating version info..."
5471+
CommandLine="&quot;$(SolutionDir)prebuilt\bin\Revolution.exe&quot; &quot;$(InputPath)&quot; &quot;$(ProjectDir)&quot;"
5472+
AdditionalDependencies="$(ProjectDir)include\revbuilt.h.in;$(SolutionDir)\version"
5473+
Outputs="$(ProjectDir)include\revbuild.h"
5474+
/>
5475+
</FileConfiguration>
5476+
<FileConfiguration
5477+
Name="Release|Win32"
5478+
>
5479+
<Tool
5480+
Name="VCCustomBuildTool"
5481+
Description="Generating version info..."
5482+
CommandLine="&quot;$(SolutionDir)prebuilt\bin\Revolution.exe&quot; &quot;$(InputPath)&quot; &quot;$(ProjectDir)&quot;"
5483+
AdditionalDependencies="$(ProjectDir)include\revbuilt.h.in;$(SolutionDir)\version"
5484+
Outputs="$(ProjectDir)include\revbuild.h"
5485+
/>
5486+
</FileConfiguration>
5487+
</File>
54625488
<File
54635489
RelativePath=".\Makefile"
54645490
>

‎engine/src/mode_development.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
6363
#include "w32prefix.h"
6464
#include "w32dc.h"
6565
#include <process.h>
66+
67+
// MW-2013-04-18: [[ Bug ]] Temporarily undefine 'GetObject' so that the reference
68+
// to the GetObject() parentscript object method works. (Platform-specific stuff
69+
// needs to move into separate files!)
70+
#undef GetObject
71+
6672
#elif defined(_MAC_DESKTOP)
6773
#include "osxprefix.h"
6874
#elif defined(_LINUX_DESKTOP)

0 commit comments

Comments
 (0)