aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/lscript/lscript_compile
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:19 -0500
committerJacek Antonelli2008-08-15 23:45:19 -0500
commitb235c59d60472f818a9142c0886b95a0ff4191d7 (patch)
treed323c55587584b19cc43a03f58a178823f12d3cd /linden/indra/lscript/lscript_compile
parentSecond Life viewer sources 1.18.5.3 (diff)
downloadmeta-impy-b235c59d60472f818a9142c0886b95a0ff4191d7.zip
meta-impy-b235c59d60472f818a9142c0886b95a0ff4191d7.tar.gz
meta-impy-b235c59d60472f818a9142c0886b95a0ff4191d7.tar.bz2
meta-impy-b235c59d60472f818a9142c0886b95a0ff4191d7.tar.xz
Second Life viewer sources 1.18.6.0-RC
Diffstat (limited to 'linden/indra/lscript/lscript_compile')
-rw-r--r--linden/indra/lscript/lscript_compile/indra.l16
-rw-r--r--linden/indra/lscript/lscript_compile/lscript_compile.vcproj9
-rwxr-xr-xlinden/indra/lscript/lscript_compile/lscript_compile_fb.vcproj8
-rw-r--r--linden/indra/lscript/lscript_compile/lscript_compile_fb_vc8.vcproj237
4 files changed, 144 insertions, 126 deletions
diff --git a/linden/indra/lscript/lscript_compile/indra.l b/linden/indra/lscript/lscript_compile/indra.l
index 69e77fb..57aef07 100644
--- a/linden/indra/lscript/lscript_compile/indra.l
+++ b/linden/indra/lscript/lscript_compile/indra.l
@@ -651,14 +651,6 @@ int yyerror(const char *fmt, ...)
651 return 0; 651 return 0;
652} 652}
653 653
654#define LL_MKS_YACC 0
655#if LL_WINDOWS && LL_MKS_YACC
656int yyinput(void)
657{
658 return input();
659}
660#endif
661
662//#define EMERGENCY_DEBUG_PRINTOUTS 654//#define EMERGENCY_DEBUG_PRINTOUTS
663//#define EMIT_CIL_ASSEMBLER 655//#define EMIT_CIL_ASSEMBLER
664 656
@@ -685,11 +677,9 @@ BOOL lscript_compile(const char* src_filename, const char* dst_filename,
685 yyout = LLFile::fopen(err_filename, "w"); 677 yyout = LLFile::fopen(err_filename, "w");
686 678
687 // Reset the lexer's internal buffering. 679 // Reset the lexer's internal buffering.
688#if LL_DARWIN || LL_LINUX || !LL_MKS_YACC 680
689 yyrestart(yyin); 681 yyrestart(yyin);
690#else 682
691 yy_reset();
692#endif
693 b_parse_ok = !yyparse(); 683 b_parse_ok = !yyparse();
694 684
695 if (b_parse_ok) 685 if (b_parse_ok)
diff --git a/linden/indra/lscript/lscript_compile/lscript_compile.vcproj b/linden/indra/lscript/lscript_compile/lscript_compile.vcproj
index fd03fa0..59822f2 100644
--- a/linden/indra/lscript/lscript_compile/lscript_compile.vcproj
+++ b/linden/indra/lscript/lscript_compile/lscript_compile.vcproj
@@ -30,7 +30,8 @@
30 WarningLevel="3" 30 WarningLevel="3"
31 WarnAsError="FALSE" 31 WarnAsError="FALSE"
32 Detect64BitPortabilityProblems="FALSE" 32 Detect64BitPortabilityProblems="FALSE"
33 DebugInformationFormat="4"/> 33 DebugInformationFormat="4"
34 DisableSpecificWarnings="4065"/>
34 <Tool 35 <Tool
35 Name="VCCustomBuildTool"/> 36 Name="VCCustomBuildTool"/>
36 <Tool 37 <Tool
@@ -72,7 +73,8 @@
72 WarningLevel="3" 73 WarningLevel="3"
73 WarnAsError="FALSE" 74 WarnAsError="FALSE"
74 Detect64BitPortabilityProblems="FALSE" 75 Detect64BitPortabilityProblems="FALSE"
75 DebugInformationFormat="3"/> 76 DebugInformationFormat="3"
77 DisableSpecificWarnings="4065"/>
76 <Tool 78 <Tool
77 Name="VCCustomBuildTool"/> 79 Name="VCCustomBuildTool"/>
78 <Tool 80 <Tool
@@ -115,7 +117,8 @@
115 WarningLevel="3" 117 WarningLevel="3"
116 WarnAsError="FALSE" 118 WarnAsError="FALSE"
117 Detect64BitPortabilityProblems="FALSE" 119 Detect64BitPortabilityProblems="FALSE"
118 DebugInformationFormat="3"/> 120 DebugInformationFormat="3"
121 DisableSpecificWarnings="4065"/>
119 <Tool 122 <Tool
120 Name="VCCustomBuildTool"/> 123 Name="VCCustomBuildTool"/>
121 <Tool 124 <Tool
diff --git a/linden/indra/lscript/lscript_compile/lscript_compile_fb.vcproj b/linden/indra/lscript/lscript_compile/lscript_compile_fb.vcproj
index c61e6ec..e65b8cd 100755
--- a/linden/indra/lscript/lscript_compile/lscript_compile_fb.vcproj
+++ b/linden/indra/lscript/lscript_compile/lscript_compile_fb.vcproj
@@ -74,8 +74,7 @@
74 <Tool 74 <Tool
75 Name="VCCustomBuildTool" 75 Name="VCCustomBuildTool"
76 Description="Building lex_yy.cpp" 76 Description="Building lex_yy.cpp"
77 CommandLine="C:\cygwin\bin\flex.exe -olex_yy.cpp indra.l 77 CommandLine="C:\cygwin\bin\flex.exe -olex_yy.cpp indra.l"
78"
79 Outputs="lex_yy.cpp"/> 78 Outputs="lex_yy.cpp"/>
80 </FileConfiguration> 79 </FileConfiguration>
81 </File> 80 </File>
@@ -86,7 +85,7 @@
86 <Tool 85 <Tool
87 Name="VCCustomBuildTool" 86 Name="VCCustomBuildTool"
88 Description="Building ytab.cpp" 87 Description="Building ytab.cpp"
89 CommandLine="C:\cygwin\bin\bison.exe -o ytab.cpp -v -d indra.y 88 CommandLine="C:\cygwin\bin\bison.exe -y -d -v -o ytab.cpp indra.y
90" 89"
91 Outputs="ytab.cpp;ytab.h"/> 90 Outputs="ytab.cpp;ytab.h"/>
92 </FileConfiguration> 91 </FileConfiguration>
@@ -95,7 +94,8 @@
95 <Tool 94 <Tool
96 Name="VCCustomBuildTool" 95 Name="VCCustomBuildTool"
97 Description="Building ytab.cpp" 96 Description="Building ytab.cpp"
98 CommandLine="C:\cygwin\bin\bison.exe -y -d -v -o ytab.cpp indra.y 97 CommandLine="dir
98C:\cygwin\bin\bison.exe -y -d -v -o ytab.cpp indra.y
99C:\cygwin\bin\mv.exe ytab.hpp ytab.h" 99C:\cygwin\bin\mv.exe ytab.hpp ytab.h"
100 Outputs="ytab.cpp;ytab.h"/> 100 Outputs="ytab.cpp;ytab.h"/>
101 </FileConfiguration> 101 </FileConfiguration>
diff --git a/linden/indra/lscript/lscript_compile/lscript_compile_fb_vc8.vcproj b/linden/indra/lscript/lscript_compile/lscript_compile_fb_vc8.vcproj
index c61e6ec..1b2e3b7 100644
--- a/linden/indra/lscript/lscript_compile/lscript_compile_fb_vc8.vcproj
+++ b/linden/indra/lscript/lscript_compile/lscript_compile_fb_vc8.vcproj
@@ -1,106 +1,131 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="7.10" 4 Version="8.00"
5 Name="lscript_compile_fb" 5 Name="lscript_compile_fb_vc8"
6 ProjectGUID="{B771CF1B-E253-47BD-8B0A-6B0440CC9228}" 6 ProjectGUID="{B771CF1B-E253-47BD-8B0A-6B0440CC9228}"
7 RootNamespace="lscript_compile_fb" 7 RootNamespace="lscript_compile_fb"
8 Keyword="MakeFileProj"> 8 Keyword="MakeFileProj"
9 <Platforms> 9 >
10 <Platform 10 <Platforms>
11 Name="Win32"/> 11 <Platform
12 </Platforms> 12 Name="Win32"
13 <Configurations> 13 />
14 <Configuration 14 </Platforms>
15 Name="Debug|Win32" 15 <ToolFiles>
16 OutputDirectory="." 16 </ToolFiles>
17 IntermediateDirectory="Debug_fb" 17 <Configurations>
18 ConfigurationType="10"> 18 <Configuration
19 <Tool 19 Name="Debug|Win32"
20 Name="VCCustomBuildTool"/> 20 OutputDirectory="."
21 <Tool 21 IntermediateDirectory="Debug_fb"
22 Name="VCMIDLTool"/> 22 ConfigurationType="10"
23 <Tool 23 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
24 Name="VCPostBuildEventTool"/> 24 >
25 <Tool 25 <Tool
26 Name="VCPreBuildEventTool"/> 26 Name="VCPreBuildEventTool"
27 </Configuration> 27 />
28 <Configuration 28 <Tool
29 Name="Release|Win32" 29 Name="VCCustomBuildTool"
30 OutputDirectory="." 30 />
31 IntermediateDirectory="Release_fb" 31 <Tool
32 ConfigurationType="10"> 32 Name="VCMIDLTool"
33 <Tool 33 />
34 Name="VCCustomBuildTool"/> 34 <Tool
35 <Tool 35 Name="VCPostBuildEventTool"
36 Name="VCMIDLTool"/> 36 />
37 <Tool 37 </Configuration>
38 Name="VCPostBuildEventTool"/> 38 <Configuration
39 <Tool 39 Name="Release|Win32"
40 Name="VCPreBuildEventTool"/> 40 OutputDirectory="."
41 </Configuration> 41 IntermediateDirectory="Release_fb"
42 </Configurations> 42 ConfigurationType="10"
43 <References> 43 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
44 </References> 44 >
45 <Files> 45 <Tool
46 <Filter 46 Name="VCPreBuildEventTool"
47 Name="Source Files" 47 />
48 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" 48 <Tool
49 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> 49 Name="VCCustomBuildTool"
50 </Filter> 50 />
51 <Filter 51 <Tool
52 Name="Header Files" 52 Name="VCMIDLTool"
53 Filter="h;hpp;hxx;hm;inl;inc;xsd" 53 />
54 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> 54 <Tool
55 </Filter> 55 Name="VCPostBuildEventTool"
56 <Filter 56 />
57 Name="Resource Files" 57 </Configuration>
58 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" 58 </Configurations>
59 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> 59 <References>
60 </Filter> 60 </References>
61 <File 61 <Files>
62 RelativePath=".\indra.l"> 62 <Filter
63 <FileConfiguration 63 Name="Source Files"
64 Name="Debug|Win32"> 64 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
65 <Tool 65 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
66 Name="VCCustomBuildTool" 66 >
67 Description="Building lex_yy.cpp" 67 </Filter>
68 CommandLine="C:\cygwin\bin\flex.exe -olex_yy.cpp indra.l 68 <Filter
69" 69 Name="Header Files"
70 Outputs="lex_yy.cpp"/> 70 Filter="h;hpp;hxx;hm;inl;inc;xsd"
71 </FileConfiguration> 71 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
72 <FileConfiguration 72 >
73 Name="Release|Win32"> 73 </Filter>
74 <Tool 74 <Filter
75 Name="VCCustomBuildTool" 75 Name="Resource Files"
76 Description="Building lex_yy.cpp" 76 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
77 CommandLine="C:\cygwin\bin\flex.exe -olex_yy.cpp indra.l 77 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
78" 78 >
79 Outputs="lex_yy.cpp"/> 79 </Filter>
80 </FileConfiguration> 80 <File
81 </File> 81 RelativePath=".\indra.l"
82 <File 82 >
83 RelativePath=".\indra.y"> 83 <FileConfiguration
84 <FileConfiguration 84 Name="Debug|Win32"
85 Name="Debug|Win32"> 85 >
86 <Tool 86 <Tool
87 Name="VCCustomBuildTool" 87 Name="VCCustomBuildTool"
88 Description="Building ytab.cpp" 88 Description="Building lex_yy.cpp"
89 CommandLine="C:\cygwin\bin\bison.exe -o ytab.cpp -v -d indra.y 89 CommandLine="C:\cygwin\bin\flex.exe -olex_yy.cpp indra.l&#x0D;&#x0A;"
90" 90 Outputs="lex_yy.cpp"
91 Outputs="ytab.cpp;ytab.h"/> 91 />
92 </FileConfiguration> 92 </FileConfiguration>
93 <FileConfiguration 93 <FileConfiguration
94 Name="Release|Win32"> 94 Name="Release|Win32"
95 <Tool 95 >
96 Name="VCCustomBuildTool" 96 <Tool
97 Description="Building ytab.cpp" 97 Name="VCCustomBuildTool"
98 CommandLine="C:\cygwin\bin\bison.exe -y -d -v -o ytab.cpp indra.y 98 Description="Building lex_yy.cpp"
99C:\cygwin\bin\mv.exe ytab.hpp ytab.h" 99 CommandLine="C:\cygwin\bin\flex.exe -olex_yy.cpp indra.l&#x0D;&#x0A;"
100 Outputs="ytab.cpp;ytab.h"/> 100 Outputs="lex_yy.cpp"
101 </FileConfiguration> 101 />
102 </File> 102 </FileConfiguration>
103 </Files> 103 </File>
104 <Globals> 104 <File
105 </Globals> 105 RelativePath=".\indra.y"
106</VisualStudioProject> 106 >
107 <FileConfiguration
108 Name="Debug|Win32"
109 >
110 <Tool
111 Name="VCCustomBuildTool"
112 Description="Building ytab.cpp"
113 CommandLine="C:\cygwin\bin\bison.exe -y -d -v -o ytab.cpp indra.y&#x0D;&#x0A;"
114 Outputs="ytab.cpp;ytab.h"
115 />
116 </FileConfiguration>
117 <FileConfiguration
118 Name="Release|Win32"
119 >
120 <Tool
121 Name="VCCustomBuildTool"
122 Description="Building ytab.cpp"
123 CommandLine="dir&#x0D;&#x0A;C:\cygwin\bin\bison.exe -y -d -v -o ytab.cpp indra.y&#x0D;&#x0A;C:\cygwin\bin\mv.exe ytab.hpp ytab.h&#x0D;&#x0A;"
124 Outputs="ytab.cpp;ytab.h"
125 />
126 </FileConfiguration>
127 </File>
128 </Files>
129 <Globals>
130 </Globals>
131</VisualStudioProject>
generated by cgit v1.1 at 2024-11-16 04:35:16 +0000