Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates for the red headed stepsister. 

Refs #2936.
master
vexed 2011-11-07 22:16:16 -05:00 committed by cybersphinx
parent 3be85b0aa6
commit de28a736ef
18 changed files with 220 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -78,8 +78,8 @@ win32/__BUILD_CONFIG.USER
# Autogenerated files:
*.lex.[ch]
*.tab.[ch]
*.lex.[ch]pp
*.tab.[ch]pp
*lexer.[ch]pp
*parser.[ch]pp
/src/autorevision.h
*.moc.h

34
lib/framework/framework.vcxproj
View File

@ -106,11 +106,11 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='STLport-Debug|Win32'">
<FlexGenerator>
<OutputFile>%(Filename).lex.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</FlexGenerator>
<BisonParser>
<Defines>true</Defines>
<OutputFile>%(Filename).tab.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</BisonParser>
<ClCompile>
<Optimization>Disabled</Optimization>
@ -178,7 +178,7 @@
<ClCompile Include="geometry.cpp" />
<ClCompile Include="i18n.cpp" />
<ClCompile Include="lexer_input.cpp" />
<ClCompile Include="resource_lexer.lex.cpp">
<ClCompile Include="resource_lexer.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='STLport-Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
@ -188,24 +188,16 @@
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='STLport-Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
<ClCompile Include="resource_parser.tab.cpp" />
<ClCompile Include="resource_parser.cpp" />
<ClCompile Include="stdio_ext.cpp" />
<ClCompile Include="strres.cpp" />
<ClCompile Include="strres_lexer.lex.cpp" />
<ClCompile Include="strres_parser.tab.cpp" />
<ClCompile Include="strres_lexer.cpp" />
<ClCompile Include="strres_parser.cpp" />
<ClCompile Include="treap.cpp" />
<ClCompile Include="trig.cpp" />
<ClCompile Include="utf.cpp" />
<ClCompile Include="wzapp.cpp" />
</ItemGroup>
<ItemGroup>
<FlexGenerator Include="resource_lexer.l" />
<FlexGenerator Include="strres_lexer.l" />
</ItemGroup>
<ItemGroup>
<BisonParser Include="resource_parser.y" />
<BisonParser Include="strres_parser.y" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\exceptionhandler\exceptionhandler.vcxproj">
<Project>{9dc871e4-d58d-4af6-85a6-7df7a39b8c18}</Project>
@ -248,6 +240,20 @@
<ClInclude Include="wzfs.h" />
<ClInclude Include="wzglobal.h" />
</ItemGroup>
<ItemGroup>
<FlexGenerator Include="resource_lexer.lpp">
<FileType>Document</FileType>
</FlexGenerator>
<BisonParser Include="resource_parser.ypp">
<FileType>Document</FileType>
</BisonParser>
<FlexGenerator Include="strres_lexer.lpp">
<FileType>Document</FileType>
</FlexGenerator>
<BisonParser Include="strres_parser.ypp">
<FileType>Document</FileType>
</BisonParser>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\devpkg\FlexBison.targets" />

56
lib/framework/framework.vcxproj.filters
View File

@ -32,24 +32,12 @@
<ClCompile Include="lexer_input.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="resource_lexer.lex.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="resource_parser.tab.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="stdio_ext.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="strres.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="strres_lexer.lex.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="strres_parser.tab.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="treap.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@ -65,22 +53,18 @@
<ClCompile Include="geometry.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<FlexGenerator Include="resource_lexer.l">
<Filter>FlexBison</Filter>
</FlexGenerator>
<FlexGenerator Include="strres_lexer.l">
<Filter>FlexBison</Filter>
</FlexGenerator>
</ItemGroup>
<ItemGroup>
<BisonParser Include="resource_parser.y">
<Filter>FlexBison</Filter>
</BisonParser>
<BisonParser Include="strres_parser.y">
<Filter>FlexBison</Filter>
</BisonParser>
<ClCompile Include="resource_lexer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="resource_parser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="strres_lexer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="strres_parser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="crc.h">
@ -186,4 +170,20 @@
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<FlexGenerator Include="resource_lexer.lpp">
<Filter>FlexBison</Filter>
</FlexGenerator>
<FlexGenerator Include="strres_lexer.lpp">
<Filter>FlexBison</Filter>
</FlexGenerator>
</ItemGroup>
<ItemGroup>
<BisonParser Include="resource_parser.ypp">
<Filter>FlexBison</Filter>
</BisonParser>
<BisonParser Include="strres_parser.ypp">
<Filter>FlexBison</Filter>
</BisonParser>
</ItemGroup>
</Project>

5
lib/framework/resource_lexer.lpp
View File

@ -28,8 +28,11 @@
#include "lib/framework/resly.h"
/* Get the Yacc definitions */
#if defined (WZ_CC_MSVC)
#include "resource_parser.hpp"
#else
#include "resource_parser.h"
#endif
extern void res_error(const char* msg);
#include "lib/framework/lexer_input.h"

5
lib/framework/strres_lexer.lpp
View File

@ -34,8 +34,11 @@
#include <physfs.h>
/* Get the Yacc definitions */
#if defined (WZ_CC_MSVC)
#include "strres_parser.hpp"
#else
#include "strres_parser.h"
#endif
#include "lib/framework/lexer_input.h"
// fwrite declared with warn_unused_result, resulting in mysterious errors in "%%" on some distros.

4
lib/gamelib/audp_lexer.lpp
View File

@ -26,8 +26,12 @@
#include "lib/gamelib/parser.h"
#if defined (WZ_CC_MSVC)
#include "audp_parser.hpp"
#else
/* Get the Yacc definitions */
#include "audp_parser.h"
#endif
// fwrite declared with warn_unused_result, resulting in mysterious errors in "%%" on some distros.
static inline bool no_warn_unused_result(int ignore) { if (ignore) {} return true; }

18
lib/gamelib/gamelib.vcxproj
View File

@ -100,11 +100,11 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='STLport-Debug|Win32'">
<FlexGenerator>
<OutputFile>%(Filename).lex.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</FlexGenerator>
<BisonParser>
<Defines>true</Defines>
<OutputFile>%(Filename).tab.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</BisonParser>
<ClCompile>
<Optimization>Disabled</Optimization>
@ -155,8 +155,8 @@
<ItemGroup>
<ClCompile Include="anim.cpp" />
<ClCompile Include="animobj.cpp" />
<ClCompile Include="audp_lexer.lex.cpp" />
<ClCompile Include="audp_parser.tab.cpp" />
<ClCompile Include="audp_lexer.cpp" />
<ClCompile Include="audp_parser.cpp" />
<ClCompile Include="gtime.cpp" />
<ClCompile Include="hashtable.cpp" />
</ItemGroup>
@ -169,10 +169,12 @@
<ClInclude Include="parser.h" />
</ItemGroup>
<ItemGroup>
<FlexGenerator Include="audp_lexer.l" />
</ItemGroup>
<ItemGroup>
<BisonParser Include="audp_parser.y" />
<FlexGenerator Include="audp_lexer.lpp">
<FileType>Document</FileType>
</FlexGenerator>
<BisonParser Include="audp_parser.ypp">
<FileType>Document</FileType>
</BisonParser>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

24
lib/gamelib/gamelib.vcxproj.filters
View File

@ -20,18 +20,18 @@
<ClCompile Include="animobj.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="audp_lexer.lex.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="audp_parser.tab.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="gtime.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="hashtable.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="audp_parser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="audp_lexer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="anim.h">
@ -54,13 +54,13 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<FlexGenerator Include="audp_lexer.l">
<Filter>FlexBison</Filter>
</FlexGenerator>
</ItemGroup>
<ItemGroup>
<BisonParser Include="audp_parser.y">
<BisonParser Include="audp_parser.ypp">
<Filter>FlexBison</Filter>
</BisonParser>
</ItemGroup>
<ItemGroup>
<FlexGenerator Include="audp_lexer.lpp">
<Filter>FlexBison</Filter>
</FlexGenerator>
</ItemGroup>
</Project>

4
lib/script/chat_lexer.lpp
View File

@ -32,7 +32,11 @@
#include "lib/script/chat_processing.h"
/* Get the Yacc definitions */
#if defined (WZ_CC_MSVC)
#include "chat_parser.hpp"
#else
#include "chat_parser.h"
#endif
// fwrite declared with warn_unused_result, resulting in mysterious errors in "%%" on some distros.
static inline bool no_warn_unused_result(int ignore) { if (ignore) {} return true; }

30
lib/script/script.vcxproj
View File

@ -100,11 +100,11 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='STLport-Debug|Win32'">
<FlexGenerator>
<OutputFile>%(Filename).lex.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</FlexGenerator>
<BisonParser>
<Defines>true</Defines>
<OutputFile>%(Filename).tab.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</BisonParser>
<ClCompile>
<Optimization>Disabled</Optimization>
@ -153,15 +153,15 @@
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="chat_lexer.lex.cpp" />
<ClCompile Include="chat_parser.tab.cpp" />
<ClCompile Include="chat_lexer.cpp" />
<ClCompile Include="chat_parser.cpp" />
<ClCompile Include="codeprint.cpp" />
<ClCompile Include="event.cpp" />
<ClCompile Include="eventsave.cpp" />
<ClCompile Include="interpreter.cpp" />
<ClCompile Include="script.cpp" />
<ClCompile Include="script_lexer.lex.cpp" />
<ClCompile Include="script_parser.tab.cpp" />
<ClCompile Include="script_lexer.cpp" />
<ClCompile Include="script_parser.cpp" />
<ClCompile Include="stack.cpp" />
</ItemGroup>
<ItemGroup>
@ -177,12 +177,18 @@
<ClInclude Include="stack.h" />
</ItemGroup>
<ItemGroup>
<FlexGenerator Include="chat_lexer.l" />
<FlexGenerator Include="script_lexer.l" />
</ItemGroup>
<ItemGroup>
<BisonParser Include="chat_parser.y" />
<BisonParser Include="script_parser.y" />
<FlexGenerator Include="chat_lexer.lpp">
<FileType>Document</FileType>
</FlexGenerator>
<BisonParser Include="chat_parser.ypp">
<FileType>Document</FileType>
</BisonParser>
<FlexGenerator Include="script_lexer.lpp">
<FileType>Document</FileType>
</FlexGenerator>
<BisonParser Include="script_parser.ypp">
<FileType>Document</FileType>
</BisonParser>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

32
lib/script/script.vcxproj.filters
View File

@ -14,12 +14,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="chat_lexer.lex.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="chat_parser.tab.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="codeprint.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@ -35,15 +29,21 @@
<ClCompile Include="script.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="script_lexer.lex.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="script_parser.tab.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="stack.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="chat_lexer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="chat_parser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="script_lexer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="script_parser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="chat_parser.tab.hpp">
@ -78,18 +78,18 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<FlexGenerator Include="chat_lexer.l">
<FlexGenerator Include="chat_lexer.lpp">
<Filter>FlexBison</Filter>
</FlexGenerator>
<FlexGenerator Include="script_lexer.l">
<FlexGenerator Include="script_lexer.lpp">
<Filter>FlexBison</Filter>
</FlexGenerator>
</ItemGroup>
<ItemGroup>
<BisonParser Include="chat_parser.y">
<BisonParser Include="chat_parser.ypp">
<Filter>FlexBison</Filter>
</BisonParser>
<BisonParser Include="script_parser.y">
<BisonParser Include="script_parser.ypp">
<Filter>FlexBison</Filter>
</BisonParser>
</ItemGroup>

5
lib/script/script_lexer.lpp
View File

@ -31,8 +31,11 @@
#include "lib/script/script.h"
/* Get the Yacc definitions */
#if defined (WZ_CC_MSVC)
#include "script_parser.hpp"
#else
#include "script_parser.h"
#endif
// fwrite declared with warn_unused_result, resulting in mysterious errors in "%%" on some distros.
static inline bool no_warn_unused_result(int ignore) { if (ignore) {} return true; }
#define fwrite(a, b, c, d) no_warn_unused_result(fwrite(a, b, c, d))

40
src/Warzone2100.vcxproj
View File

@ -157,11 +157,11 @@
<BisonParser>
<Defines>true</Defines>
<NoGenLineDirectives>false</NoGenLineDirectives>
<OutputFile>%(Filename).tab.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
<RenameExternalSymbols>%(Filename)</RenameExternalSymbols>
</BisonParser>
<FlexGenerator>
<OutputFile>%(Filename).lex.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
<TraceMode>false</TraceMode>
<ScannerPrefix>%(Filename)</ScannerPrefix>
</FlexGenerator>
@ -322,7 +322,7 @@
<ClCompile Include="keybind.cpp" />
<ClCompile Include="keyedit.cpp" />
<ClCompile Include="keymap.cpp" />
<ClCompile Include="level_lexer.lex.cpp" />
<ClCompile Include="level_lexer.cpp" />
<ClCompile Include="levels.cpp" />
<ClCompile Include="lighting.cpp" />
<ClCompile Include="loadsave.cpp" />
@ -333,8 +333,8 @@
<ClCompile Include="mapgrid.cpp" />
<ClCompile Include="mechanics.cpp" />
<ClCompile Include="message.cpp" />
<ClCompile Include="message_lexer.lex.cpp" />
<ClCompile Include="message_parser.tab.cpp" />
<ClCompile Include="message_lexer.cpp" />
<ClCompile Include="message_parser.cpp" />
<ClCompile Include="miscimd.cpp" />
<ClCompile Include="mission.cpp" />
<ClCompile Include="move.cpp" />
@ -371,8 +371,8 @@
<ClCompile Include="scriptobj.cpp" />
<ClCompile Include="scripttabs.cpp" />
<ClCompile Include="scriptvals.cpp" />
<ClCompile Include="scriptvals_lexer.lex.cpp" />
<ClCompile Include="scriptvals_parser.tab.cpp" />
<ClCompile Include="scriptvals_lexer.cpp" />
<ClCompile Include="scriptvals_parser.cpp" />
<ClCompile Include="selection.cpp" />
<ClCompile Include="seqdisp.cpp" />
<ClCompile Include="stats.cpp" />
@ -518,15 +518,6 @@
<ClInclude Include="weapondef.h" />
<ClInclude Include="wrappers.h" />
</ItemGroup>
<ItemGroup>
<FlexGenerator Include="level_lexer.l" />
<FlexGenerator Include="message_lexer.l" />
<FlexGenerator Include="scriptvals_lexer.l" />
</ItemGroup>
<ItemGroup>
<BisonParser Include="message_parser.y" />
<BisonParser Include="scriptvals_parser.y" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\lib\exceptionhandler\exceptionhandler.vcxproj">
<Project>{9dc871e4-d58d-4af6-85a6-7df7a39b8c18}</Project>
@ -570,6 +561,23 @@
<ItemGroup>
<ResourceCompile Include="..\win32\warzone2100.rc" />
</ItemGroup>
<ItemGroup>
<FlexGenerator Include="level_lexer.lpp">
<FileType>Document</FileType>
</FlexGenerator>
<FlexGenerator Include="message_lexer.lpp">
<FileType>Document</FileType>
</FlexGenerator>
<BisonParser Include="message_parser.ypp">
<FileType>Document</FileType>
</BisonParser>
<FlexGenerator Include="scriptvals_lexer.lpp">
<FileType>Document</FileType>
</FlexGenerator>
<BisonParser Include="scriptvals_parser.ypp">
<FileType>Document</FileType>
</BisonParser>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\devpkg\FlexBison.targets" />

68
src/Warzone2100.vcxproj.filters
View File

@ -156,9 +156,6 @@
<ClCompile Include="keymap.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="level_lexer.lex.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="levels.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@ -189,12 +186,6 @@
<ClCompile Include="message.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="message_lexer.lex.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="message_parser.tab.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="miscimd.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@ -297,12 +288,6 @@
<ClCompile Include="scriptvals.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="scriptvals_lexer.lex.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="scriptvals_parser.tab.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="selection.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@ -351,6 +336,21 @@
<ClCompile Include="qtscriptfuncs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="scriptvals_parser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="scriptvals_lexer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="message_parser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="message_lexer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="level_lexer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="action.h">
@ -738,28 +738,28 @@
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<FlexGenerator Include="level_lexer.l">
<Filter>FlexBison</Filter>
</FlexGenerator>
<FlexGenerator Include="message_lexer.l">
<Filter>FlexBison</Filter>
</FlexGenerator>
<FlexGenerator Include="scriptvals_lexer.l">
<Filter>FlexBison</Filter>
</FlexGenerator>
</ItemGroup>
<ItemGroup>
<BisonParser Include="message_parser.y">
<Filter>FlexBison</Filter>
</BisonParser>
<BisonParser Include="scriptvals_parser.y">
<Filter>FlexBison</Filter>
</BisonParser>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\win32\warzone2100.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<FlexGenerator Include="level_lexer.lpp">
<Filter>FlexBison</Filter>
</FlexGenerator>
<FlexGenerator Include="message_lexer.lpp">
<Filter>FlexBison</Filter>
</FlexGenerator>
<FlexGenerator Include="scriptvals_lexer.lpp">
<Filter>FlexBison</Filter>
</FlexGenerator>
</ItemGroup>
<ItemGroup>
<BisonParser Include="message_parser.ypp">
<Filter>FlexBison</Filter>
</BisonParser>
<BisonParser Include="scriptvals_parser.ypp">
<Filter>FlexBison</Filter>
</BisonParser>
</ItemGroup>
</Project>

4
src/message_lexer.lpp
View File

@ -28,7 +28,11 @@
#include "src/messagedef.h"
/* Get the Yacc definitions */
#if defined (WZ_CC_MSVC)
#include "message_parser.hpp"
#else
#include "message_parser.h"
#endif
#include "lib/framework/lexer_input.h"
#include "src/messagely.h"

5
src/scriptvals_lexer.lpp
View File

@ -32,8 +32,11 @@
#include "src/scriptvals.h"
/* Get the Yacc definitions */
#if defined (WZ_CC_MSVC)
#include "scriptvals_parser.hpp"
#else
#include "scriptvals_parser.h"
#endif
/* Maximum length for any TEXT value */
#ifndef YYLMAX

6
src/scriptvals_parser.ypp
View File

@ -34,7 +34,13 @@
#include "src/scriptvals.h"
#include "lib/framework/lexer_input.h"
#if defined (WZ_CC_MSVC)
#include "scriptvals_parser.hpp"
#else
#include "scriptvals_parser.h"
#endif
#include "src/scripttabs.h"
#include "src/objects.h"
#include "src/droid.h"

44
win32/MSVCdelparser.bat
View File

@ -1,23 +1,23 @@
del ..\lib\framework\resource_lexer.lex.cpp
del ..\lib\framework\resource_parser.tab.cpp
del ..\lib\framework\resource_parser.tab.hpp
del ..\lib\framework\strres_lexer.lex.cpp
del ..\lib\framework\strres_parser.tab.cpp
del ..\lib\framework\strres_parser.tab.hpp
del ..\lib\gamelib\audp_lexer.lex.cpp
del ..\lib\gamelib\audp_parser.tab.cpp
del ..\lib\gamelib\audp_parser.tab.hpp
del ..\lib\script\chat_lexer.lex.cpp
del ..\lib\script\chat_parser.tab.cpp
del ..\lib\script\chat_parser.tab.hpp
del ..\lib\script\script_lexer.lex.cpp
del ..\lib\script\script_parser.tab.cpp
del ..\lib\script\script_parser.tab.h
del ..\lib\framework\resource_lexer.cpp
del ..\lib\framework\resource_parser.cpp
del ..\lib\framework\resource_parser.hpp
del ..\lib\framework\strres_lexer.cpp
del ..\lib\framework\strres_parser.cpp
del ..\lib\framework\strres_parser.hpp
del ..\lib\gamelib\audp_lexer.cpp
del ..\lib\gamelib\audp_parser.cpp
del ..\lib\gamelib\audp_parser.hpp
del ..\lib\script\chat_lexer.cpp
del ..\lib\script\chat_parser.cpp
del ..\lib\script\chat_parser.hpp
del ..\lib\script\script_lexer.cpp
del ..\lib\script\script_parser.cpp
del ..\lib\script\script_parser.hpp
del ..\src\autorevision.h
del ..\src\level_lexer.lex.cpp
del ..\src\message_lexer.lex.cpp
del ..\src\message_parser.tab.cpp
del ..\src\message_parser.tab.hpp
del ..\src\scriptvals_lexer.lex.cpp
del ..\src\scriptvals_parser.tab.cpp
del ..\src\scriptvals_parser.tab.hpp
del ..\src\level_lexer.cpp
del ..\src\message_lexer.cpp
del ..\src\message_parser.cpp
del ..\src\message_parser.hpp
del ..\src\scriptvals_lexer.cpp
del ..\src\scriptvals_parser.cpp
del ..\src\scriptvals_parser.hpp