diff options
-rw-r--r-- | Dalos/Dalos.cc | 7 | ||||
-rw-r--r-- | MSVC/Baltisot - generic/Baltisot - generic.vcproj | 1996 | ||||
-rw-r--r-- | cd-tool.cpp | 5 | ||||
-rw-r--r-- | compile/linux/Makefile | 3 | ||||
-rw-r--r-- | compile/win32/Makefile | 3 |
5 files changed, 1017 insertions, 997 deletions
diff --git a/Dalos/Dalos.cc b/Dalos/Dalos.cc index 4a045ef..fb4c37d 100644 --- a/Dalos/Dalos.cc +++ b/Dalos/Dalos.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: Dalos.cc,v 1.15 2005-02-24 11:30:04 pixel Exp $ */ +/* $Id: Dalos.cc,v 1.16 2005-03-30 10:32:23 pixel Exp $ */ #include <SDL.h> #include <SDL_thread.h> @@ -30,6 +30,7 @@ #include <Buffer.h> #include <BLua.h> #include <LuaHandle.h> +#include <LuaConfigFile.h> #include <engine.h> #include <glbase.h> @@ -124,6 +125,8 @@ void start_lua() { LuaInput::pushconstruct(L); LuaOutput::pushconstruct(L); LuaBuffer::pushconstruct(L); + + LuaConfigFile::pushstatics(L); CD_PUSHSTATICS(L); Luapsx::pushstatics(L); @@ -316,7 +319,7 @@ virtual int startup() throw (GeneralException) { MainMenu = new mogltk::widgets::Menu(sh, MainPanel); Frame = new frame(sh, new mogltk::widgets::Frame(sh, MainPanel, 0, MainMenu->GetH(), Root->GetW() - 1, Root->GetH() - MainMenu->GetH() - 1)); - mogltk::widget * box = new mogltk::widgets::SmartBox(sh, MainPanel, 50, 50, 500, 400, "Hexview"); + mogltk::widget * box = new mogltk::widgets::SmartBoxClose(sh, MainPanel, 50, 50, 500, 400, "Hexview"); (new hexview(sh, box->InnerPanel()))->bind_handle(new Input(argv[0])); CurrentConsole = new console(sh, Root, 0, 8); diff --git a/MSVC/Baltisot - generic/Baltisot - generic.vcproj b/MSVC/Baltisot - generic/Baltisot - generic.vcproj index eef7467..72edc4f 100644 --- a/MSVC/Baltisot - generic/Baltisot - generic.vcproj +++ b/MSVC/Baltisot - generic/Baltisot - generic.vcproj @@ -1,992 +1,1004 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8,00"
- Name="Baltisot - generic"
- ProjectGUID="{879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
- ConfigurationType="4"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\generic\include;..\..\generic\lib\zlib\include;..\..\generic\lib\lua\includes;..\..\generic\lib\lua\include;..\dirent;..\regex"
- PreprocessorDefinitions="_WINDOWS;ZLIB_DLL;READLINE_STATIC;READLINE_LIBRARY;STDC_HEADERS;STDC"
- MinimalRebuild="TRUE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/Baltisot - generic.lib"
- IgnoreAllDefaultLibraries="FALSE"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
- ConfigurationType="4"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- OmitFramePointers="TRUE"
- AdditionalIncludeDirectories="..\..\generic\include;..\..\generic\lib\zlib\include;..\..\generic\lib\lua\includes;..\..\generic\lib\lua\include;..\dirent;..\regex"
- PreprocessorDefinitions="_WINDOWS;ZLIB_DLL;READLINE_STATIC;READLINE_LIBRARY;STDC_HEADERS;STDC"
- StringPooling="TRUE"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/Baltisot - generic.lib"
- IgnoreAllDefaultLibraries="FALSE"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Base class"
- >
- <File
- RelativePath="..\..\generic\lib\Exceptions.cc"
- >
- </File>
- <File
- RelativePath="..\..\generic\include\Exceptions.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\generic.cc"
- >
- </File>
- <File
- RelativePath="..\..\generic\include\generic.h"
- >
- </File>
- </Filter>
- <Filter
- Name="String class"
- >
- <File
- RelativePath="..\..\generic\include\BString.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\checkargs.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\datecalc.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\String.cc"
- >
- </File>
- </Filter>
- <Filter
- Name="Handle class"
- >
- <File
- RelativePath="..\..\generic\lib\Handle.cc"
- >
- </File>
- <File
- RelativePath="..\..\generic\include\Handle.h"
- >
- </File>
- <Filter
- Name="Input class"
- >
- <File
- RelativePath="..\..\generic\lib\Input.cc"
- >
- </File>
- <File
- RelativePath="..\..\generic\include\Input.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Output class"
- >
- <File
- RelativePath="..\..\generic\lib\Output.cc"
- >
- </File>
- <File
- RelativePath="..\..\generic\include\Output.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Buffer class"
- >
- <File
- RelativePath="..\..\generic\lib\Buffer.cc"
- >
- </File>
- <File
- RelativePath="..\..\generic\include\Buffer.h"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="BLua class"
- >
- <File
- RelativePath="..\..\generic\lib\BLua.cc"
- >
- </File>
- <File
- RelativePath="..\..\generic\include\BLua.h"
- >
- </File>
- <Filter
- Name="LuaHandle"
- >
- <File
- RelativePath="..\..\generic\lib\LuaHandle.cc"
- >
- </File>
- <File
- RelativePath="..\..\generic\include\LuaHandle.h"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="Main class"
- >
- <File
- RelativePath="..\..\generic\lib\Main.cc"
- >
- </File>
- <File
- RelativePath="..\..\generic\include\Main.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Regex class"
- >
- <File
- RelativePath="..\..\generic\include\BRegex.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\Regex.cc"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="ConfigFile class"
- >
- <File
- RelativePath="..\..\generic\lib\ConfigFile.cc"
- >
- </File>
- <File
- RelativePath="..\..\generic\include\ConfigFile.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Documentation"
- >
- <File
- RelativePath="..\..\generic\doc\API"
- >
- </File>
- <File
- RelativePath="..\..\generic\doc\README"
- >
- </File>
- <File
- RelativePath="..\..\generic\doc\rfc1866.txt"
- >
- </File>
- <File
- RelativePath="..\..\generic\doc\rfc2616.txt"
- >
- </File>
- <File
- RelativePath="..\..\generic\doc\rfc2812.txt"
- >
- </File>
- <File
- RelativePath="..\..\generic\doc\rfc959.txt"
- >
- </File>
- </Filter>
- <Filter
- Name="Regex (external)"
- >
- <File
- RelativePath="..\regex\msvc-regex.c"
- >
- </File>
- <File
- RelativePath="..\regex\regex.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Dirent (external)"
- >
- <File
- RelativePath="..\dirent\_mingw.h"
- >
- </File>
- <File
- RelativePath="..\dirent\dirent.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\dirent\dirent.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Lua (external)"
- >
- <File
- RelativePath="..\..\generic\lib\lua\src\luacomp.c"
- >
- </File>
- <Filter
- Name="LuaSrc"
- >
- <File
- RelativePath="..\..\generic\lib\lua\src\lapi.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\lcode.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\ldebug.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\ldo.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\ldump.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\lfunc.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\lgc.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\llex.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\lmem.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\lobject.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\lopcodes.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\lparser.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\lstate.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\lstring.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\ltable.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\ltests.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\ltm.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\lundump.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\lvm.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\lzio.c"
- >
- </File>
- </Filter>
- <Filter
- Name="LuaIncludes"
- >
- <File
- RelativePath="..\..\generic\lib\lua\include\lauxlib.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\include\lua.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\include\lualib.h"
- >
- </File>
- </Filter>
- <Filter
- Name="LuaLib"
- >
- <File
- RelativePath="..\..\generic\lib\lua\src\LuaLib\lauxlib.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\LuaLib\lbaselib.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\LuaLib\ldblib.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\LuaLib\ldirlib.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\LuaLib\liolib.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\LuaLib\lmathlib.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\LuaLib\loadlib.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\LuaLib\lstrlib.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\LuaLib\ltablib.c"
- >
- </File>
- </Filter>
- <Filter
- Name="LuaHeaders"
- >
- <File
- RelativePath="..\..\generic\lib\lua\includes\lapi.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\includes\lcode.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\includes\ldebug.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\includes\ldo.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\includes\lfunc.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\includes\lgc.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\includes\llex.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\includes\llimits.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\includes\lmem.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\includes\lobject.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\includes\lopcodes.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\includes\lparser.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\includes\lstate.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\includes\lstring.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\includes\ltable.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\includes\ltm.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\includes\lundump.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\includes\lvm.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\includes\lzio.h"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="GetOpt (external)"
- >
- <File
- RelativePath="..\getopt\getopt.c"
- >
- </File>
- <File
- RelativePath="..\getopt\getopt.h"
- >
- </File>
- <File
- RelativePath="..\getopt\getopt1.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Zlib (external)"
- >
- <Filter
- Name="Src"
- >
- <File
- RelativePath="..\..\generic\lib\zlib\src\adler32.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\compress.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\crc32.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\deflate.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\gzio.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\infblock.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\infcodes.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\inffast.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\inflate.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\inftrees.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\infutil.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\trees.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\uncompr.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\zutil.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Includes"
- >
- <File
- RelativePath="..\..\generic\lib\zlib\include\deflate.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\include\infblock.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\include\infcodes.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\include\inffast.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\include\inffixed.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\include\inftrees.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\include\infutil.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\include\trees.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\include\zconf.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\include\zlib.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\include\zutil.h"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="Readline (external)"
- >
- <File
- RelativePath="..\readline\ansi_stdlib.h"
- >
- </File>
- <File
- RelativePath="..\readline\bind.c"
- >
- </File>
- <File
- RelativePath="..\readline\callback.c"
- >
- </File>
- <File
- RelativePath="..\readline\chardefs.h"
- >
- </File>
- <File
- RelativePath="..\readline\compat.c"
- >
- </File>
- <File
- RelativePath="..\readline\complete.c"
- >
- </File>
- <File
- RelativePath="..\readline\config.h"
- >
- </File>
- <File
- RelativePath="..\readline\dirent.c"
- >
- </File>
- <File
- RelativePath="..\readline\dirent.h"
- >
- </File>
- <File
- RelativePath="..\readline\display.c"
- >
- </File>
- <File
- RelativePath="..\readline\funmap.c"
- >
- </File>
- <File
- RelativePath="..\readline\histexpand.c"
- >
- </File>
- <File
- RelativePath="..\readline\histfile.c"
- >
- </File>
- <File
- RelativePath="..\readline\histlib.h"
- >
- </File>
- <File
- RelativePath="..\readline\history.c"
- >
- </File>
- <File
- RelativePath="..\readline\history.h"
- >
- </File>
- <File
- RelativePath="..\readline\histsearch.c"
- >
- </File>
- <File
- RelativePath="..\readline\input.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\readline\isearch.c"
- >
- </File>
- <File
- RelativePath="..\readline\keymaps.c"
- >
- </File>
- <File
- RelativePath="..\readline\keymaps.h"
- >
- </File>
- <File
- RelativePath="..\readline\kill.c"
- >
- </File>
- <File
- RelativePath="..\readline\macro.c"
- >
- </File>
- <File
- RelativePath="..\readline\mbutil.c"
- >
- </File>
- <File
- RelativePath="..\readline\misc.c"
- >
- </File>
- <File
- RelativePath="..\readline\nls.c"
- >
- </File>
- <File
- RelativePath="..\readline\parens.c"
- >
- </File>
- <File
- RelativePath="..\readline\posixdir.h"
- >
- </File>
- <File
- RelativePath="..\readline\posixjmp.h"
- >
- </File>
- <File
- RelativePath="..\readline\posixstat.h"
- >
- </File>
- <File
- RelativePath="..\readline\readline.c"
- >
- </File>
- <File
- RelativePath="..\readline\readline.h"
- >
- </File>
- <File
- RelativePath="..\readline\rlconf.h"
- >
- </File>
- <File
- RelativePath="..\readline\rldefs.h"
- >
- </File>
- <File
- RelativePath="..\readline\rldynlink.h"
- >
- </File>
- <File
- RelativePath="..\readline\rlmbutil.h"
- >
- </File>
- <File
- RelativePath="..\readline\rlprivate.h"
- >
- </File>
- <File
- RelativePath="..\readline\rlshell.h"
- >
- </File>
- <File
- RelativePath="..\readline\rlstdc.h"
- >
- </File>
- <File
- RelativePath="..\readline\rltty.c"
- >
- </File>
- <File
- RelativePath="..\readline\rltty.h"
- >
- </File>
- <File
- RelativePath="..\readline\rltypedefs.h"
- >
- </File>
- <File
- RelativePath="..\readline\rlwinsize.h"
- >
- </File>
- <File
- RelativePath="..\readline\savestring.c"
- >
- </File>
- <File
- RelativePath="..\readline\search.c"
- >
- </File>
- <File
- RelativePath="..\readline\shell.c"
- >
- </File>
- <File
- RelativePath="..\readline\signals.c"
- >
- </File>
- <File
- RelativePath="..\readline\tcap.h"
- >
- </File>
- <File
- RelativePath="..\readline\terminal.c"
- >
- </File>
- <File
- RelativePath="..\readline\text.c"
- >
- </File>
- <File
- RelativePath="..\readline\tilde.c"
- >
- </File>
- <File
- RelativePath="..\readline\tilde.h"
- >
- </File>
- <File
- RelativePath="..\readline\undo.c"
- >
- </File>
- <File
- RelativePath="..\readline\util.c"
- >
- </File>
- <File
- RelativePath="..\readline\vi_keymap.c"
- >
- </File>
- <File
- RelativePath="..\readline\vi_mode.c"
- >
- </File>
- <File
- RelativePath="..\readline\xmalloc.c"
- >
- </File>
- <File
- RelativePath="..\readline\xmalloc.h"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8,00" + Name="Baltisot - generic" + ProjectGUID="{879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug" + IntermediateDirectory="Debug" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\generic\include;..\..\generic\lib\zlib\include;..\..\generic\lib\lua\includes;..\..\generic\lib\lua\include;..\dirent;..\regex" + PreprocessorDefinitions="_WINDOWS;ZLIB_DLL;READLINE_STATIC;READLINE_LIBRARY;STDC_HEADERS;STDC" + MinimalRebuild="TRUE" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/Baltisot - generic.lib" + IgnoreAllDefaultLibraries="FALSE" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release" + IntermediateDirectory="Release" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + OmitFramePointers="TRUE" + AdditionalIncludeDirectories="..\..\generic\include;..\..\generic\lib\zlib\include;..\..\generic\lib\lua\includes;..\..\generic\lib\lua\include;..\dirent;..\regex" + PreprocessorDefinitions="_WINDOWS;ZLIB_DLL;READLINE_STATIC;READLINE_LIBRARY;STDC_HEADERS;STDC" + StringPooling="TRUE" + RuntimeLibrary="0" + EnableFunctionLevelLinking="TRUE" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/Baltisot - generic.lib" + IgnoreAllDefaultLibraries="FALSE" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Base class" + > + <File + RelativePath="..\..\generic\lib\Exceptions.cc" + > + </File> + <File + RelativePath="..\..\generic\include\Exceptions.h" + > + </File> + <File + RelativePath="..\..\generic\lib\generic.cc" + > + </File> + <File + RelativePath="..\..\generic\include\generic.h" + > + </File> + </Filter> + <Filter + Name="String class" + > + <File + RelativePath="..\..\generic\include\BString.h" + > + </File> + <File + RelativePath="..\..\generic\lib\checkargs.c" + > + </File> + <File + RelativePath="..\..\generic\lib\datecalc.c" + > + </File> + <File + RelativePath="..\..\generic\lib\String.cc" + > + </File> + </Filter> + <Filter + Name="Handle class" + > + <File + RelativePath="..\..\generic\lib\Handle.cc" + > + </File> + <File + RelativePath="..\..\generic\include\Handle.h" + > + </File> + <Filter + Name="Input class" + > + <File + RelativePath="..\..\generic\lib\Input.cc" + > + </File> + <File + RelativePath="..\..\generic\include\Input.h" + > + </File> + </Filter> + <Filter + Name="Output class" + > + <File + RelativePath="..\..\generic\lib\Output.cc" + > + </File> + <File + RelativePath="..\..\generic\include\Output.h" + > + </File> + </Filter> + <Filter + Name="Buffer class" + > + <File + RelativePath="..\..\generic\lib\Buffer.cc" + > + </File> + <File + RelativePath="..\..\generic\include\Buffer.h" + > + </File> + </Filter> + </Filter> + <Filter + Name="BLua class" + > + <File + RelativePath="..\..\generic\lib\BLua.cc" + > + </File> + <File + RelativePath="..\..\generic\include\BLua.h" + > + </File> + <Filter + Name="LuaHandle" + > + <File + RelativePath="..\..\generic\lib\LuaHandle.cc" + > + </File> + <File + RelativePath="..\..\generic\include\LuaHandle.h" + > + </File> + </Filter> + <Filter + Name="LuaConfigFile" + > + <File + RelativePath="..\..\generic\lib\LuaConfigFile.cc" + > + </File> + <File + RelativePath="..\..\generic\include\LuaConfigFile.h" + > + </File> + </Filter> + </Filter> + <Filter + Name="Main class" + > + <File + RelativePath="..\..\generic\lib\Main.cc" + > + </File> + <File + RelativePath="..\..\generic\include\Main.h" + > + </File> + </Filter> + <Filter + Name="Regex class" + > + <File + RelativePath="..\..\generic\include\BRegex.h" + > + </File> + <File + RelativePath="..\..\generic\lib\Regex.cc" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)/$(InputName)1.obj" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="ConfigFile class" + > + <File + RelativePath="..\..\generic\lib\ConfigFile.cc" + > + </File> + <File + RelativePath="..\..\generic\include\ConfigFile.h" + > + </File> + </Filter> + <Filter + Name="Documentation" + > + <File + RelativePath="..\..\generic\doc\API" + > + </File> + <File + RelativePath="..\..\generic\doc\README" + > + </File> + <File + RelativePath="..\..\generic\doc\rfc1866.txt" + > + </File> + <File + RelativePath="..\..\generic\doc\rfc2616.txt" + > + </File> + <File + RelativePath="..\..\generic\doc\rfc2812.txt" + > + </File> + <File + RelativePath="..\..\generic\doc\rfc959.txt" + > + </File> + </Filter> + <Filter + Name="Regex (external)" + > + <File + RelativePath="..\regex\msvc-regex.c" + > + </File> + <File + RelativePath="..\regex\regex.h" + > + </File> + </Filter> + <Filter + Name="Dirent (external)" + > + <File + RelativePath="..\dirent\_mingw.h" + > + </File> + <File + RelativePath="..\dirent\dirent.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)/$(InputName)1.obj" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)/$(InputName)1.obj" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\dirent\dirent.h" + > + </File> + </Filter> + <Filter + Name="Lua (external)" + > + <File + RelativePath="..\..\generic\lib\lua\src\luacomp.c" + > + </File> + <Filter + Name="LuaSrc" + > + <File + RelativePath="..\..\generic\lib\lua\src\lapi.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\lcode.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\ldebug.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\ldo.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\ldump.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\lfunc.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\lgc.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\llex.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\lmem.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\lobject.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\lopcodes.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\lparser.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\lstate.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\lstring.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\ltable.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\ltests.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\ltm.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\lundump.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\lvm.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\lzio.c" + > + </File> + </Filter> + <Filter + Name="LuaIncludes" + > + <File + RelativePath="..\..\generic\lib\lua\include\lauxlib.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\include\lua.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\include\lualib.h" + > + </File> + </Filter> + <Filter + Name="LuaLib" + > + <File + RelativePath="..\..\generic\lib\lua\src\LuaLib\lauxlib.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\LuaLib\lbaselib.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\LuaLib\ldblib.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\LuaLib\ldirlib.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\LuaLib\liolib.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\LuaLib\lmathlib.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\LuaLib\loadlib.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\LuaLib\lstrlib.c" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\src\LuaLib\ltablib.c" + > + </File> + </Filter> + <Filter + Name="LuaHeaders" + > + <File + RelativePath="..\..\generic\lib\lua\includes\lapi.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\includes\lcode.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\includes\ldebug.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\includes\ldo.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\includes\lfunc.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\includes\lgc.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\includes\llex.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\includes\llimits.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\includes\lmem.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\includes\lobject.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\includes\lopcodes.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\includes\lparser.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\includes\lstate.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\includes\lstring.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\includes\ltable.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\includes\ltm.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\includes\lundump.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\includes\lvm.h" + > + </File> + <File + RelativePath="..\..\generic\lib\lua\includes\lzio.h" + > + </File> + </Filter> + </Filter> + <Filter + Name="GetOpt (external)" + > + <File + RelativePath="..\getopt\getopt.c" + > + </File> + <File + RelativePath="..\getopt\getopt.h" + > + </File> + <File + RelativePath="..\getopt\getopt1.c" + > + </File> + </Filter> + <Filter + Name="Zlib (external)" + > + <Filter + Name="Src" + > + <File + RelativePath="..\..\generic\lib\zlib\src\adler32.c" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\src\compress.c" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\src\crc32.c" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\src\deflate.c" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\src\gzio.c" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\src\infblock.c" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\src\infcodes.c" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\src\inffast.c" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\src\inflate.c" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\src\inftrees.c" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\src\infutil.c" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\src\trees.c" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\src\uncompr.c" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\src\zutil.c" + > + </File> + </Filter> + <Filter + Name="Includes" + > + <File + RelativePath="..\..\generic\lib\zlib\include\deflate.h" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\include\infblock.h" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\include\infcodes.h" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\include\inffast.h" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\include\inffixed.h" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\include\inftrees.h" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\include\infutil.h" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\include\trees.h" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\include\zconf.h" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\include\zlib.h" + > + </File> + <File + RelativePath="..\..\generic\lib\zlib\include\zutil.h" + > + </File> + </Filter> + </Filter> + <Filter + Name="Readline (external)" + > + <File + RelativePath="..\readline\ansi_stdlib.h" + > + </File> + <File + RelativePath="..\readline\bind.c" + > + </File> + <File + RelativePath="..\readline\callback.c" + > + </File> + <File + RelativePath="..\readline\chardefs.h" + > + </File> + <File + RelativePath="..\readline\compat.c" + > + </File> + <File + RelativePath="..\readline\complete.c" + > + </File> + <File + RelativePath="..\readline\config.h" + > + </File> + <File + RelativePath="..\readline\dirent.c" + > + </File> + <File + RelativePath="..\readline\dirent.h" + > + </File> + <File + RelativePath="..\readline\display.c" + > + </File> + <File + RelativePath="..\readline\funmap.c" + > + </File> + <File + RelativePath="..\readline\histexpand.c" + > + </File> + <File + RelativePath="..\readline\histfile.c" + > + </File> + <File + RelativePath="..\readline\histlib.h" + > + </File> + <File + RelativePath="..\readline\history.c" + > + </File> + <File + RelativePath="..\readline\history.h" + > + </File> + <File + RelativePath="..\readline\histsearch.c" + > + </File> + <File + RelativePath="..\readline\input.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)/$(InputName)1.obj" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)/$(InputName)1.obj" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\readline\isearch.c" + > + </File> + <File + RelativePath="..\readline\keymaps.c" + > + </File> + <File + RelativePath="..\readline\keymaps.h" + > + </File> + <File + RelativePath="..\readline\kill.c" + > + </File> + <File + RelativePath="..\readline\macro.c" + > + </File> + <File + RelativePath="..\readline\mbutil.c" + > + </File> + <File + RelativePath="..\readline\misc.c" + > + </File> + <File + RelativePath="..\readline\nls.c" + > + </File> + <File + RelativePath="..\readline\parens.c" + > + </File> + <File + RelativePath="..\readline\posixdir.h" + > + </File> + <File + RelativePath="..\readline\posixjmp.h" + > + </File> + <File + RelativePath="..\readline\posixstat.h" + > + </File> + <File + RelativePath="..\readline\readline.c" + > + </File> + <File + RelativePath="..\readline\readline.h" + > + </File> + <File + RelativePath="..\readline\rlconf.h" + > + </File> + <File + RelativePath="..\readline\rldefs.h" + > + </File> + <File + RelativePath="..\readline\rldynlink.h" + > + </File> + <File + RelativePath="..\readline\rlmbutil.h" + > + </File> + <File + RelativePath="..\readline\rlprivate.h" + > + </File> + <File + RelativePath="..\readline\rlshell.h" + > + </File> + <File + RelativePath="..\readline\rlstdc.h" + > + </File> + <File + RelativePath="..\readline\rltty.c" + > + </File> + <File + RelativePath="..\readline\rltty.h" + > + </File> + <File + RelativePath="..\readline\rltypedefs.h" + > + </File> + <File + RelativePath="..\readline\rlwinsize.h" + > + </File> + <File + RelativePath="..\readline\savestring.c" + > + </File> + <File + RelativePath="..\readline\search.c" + > + </File> + <File + RelativePath="..\readline\shell.c" + > + </File> + <File + RelativePath="..\readline\signals.c" + > + </File> + <File + RelativePath="..\readline\tcap.h" + > + </File> + <File + RelativePath="..\readline\terminal.c" + > + </File> + <File + RelativePath="..\readline\text.c" + > + </File> + <File + RelativePath="..\readline\tilde.c" + > + </File> + <File + RelativePath="..\readline\tilde.h" + > + </File> + <File + RelativePath="..\readline\undo.c" + > + </File> + <File + RelativePath="..\readline\util.c" + > + </File> + <File + RelativePath="..\readline\vi_keymap.c" + > + </File> + <File + RelativePath="..\readline\vi_mode.c" + > + </File> + <File + RelativePath="..\readline\xmalloc.c" + > + </File> + <File + RelativePath="..\readline\xmalloc.h" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/cd-tool.cpp b/cd-tool.cpp index 328067e..671503d 100644 --- a/cd-tool.cpp +++ b/cd-tool.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: cd-tool.cpp,v 1.40 2005-03-29 01:47:06 pixel Exp $ */ +/* $Id: cd-tool.cpp,v 1.41 2005-03-30 10:32:24 pixel Exp $ */ #define WIP @@ -28,6 +28,7 @@ #include "Output.h" #include "Buffer.h" #include "BLua.h" +#include "LuaConfigFile.h" #include "cdreader.h" #include "cdutils.h" #include "generic.h" @@ -365,6 +366,8 @@ Lua * start_basic_lua(void) { LuaOutput::pushconstruct(L); LuaBuffer::pushconstruct(L); + LuaConfigFile::pushstatics(L); + CD_PUSHSTATICS(L); Luapsx::pushstatics(L); diff --git a/compile/linux/Makefile b/compile/linux/Makefile index 881e260..4f60ab8 100644 --- a/compile/linux/Makefile +++ b/compile/linux/Makefile @@ -34,7 +34,8 @@ BALTISOT_SOURCES = \ ../../generic/lib/Handle.cc ../../generic/lib/String.cc \ ../../generic/lib/Input.cc ../../generic/lib/fileutils.cc \ ../../generic/lib/LuaHandle.cc ../../generic/lib/generic.cc \ -../../generic/lib/checkargs.c ../../generic/lib/datecalc.c +../../generic/lib/checkargs.c ../../generic/lib/datecalc.c \ +../../generic/lib/LuaConfigFile.cc ZLIB_SOURCES = \ ../../generic/lib/zlib/src/adler32.c ../../generic/lib/zlib/src/inffast.c \ diff --git a/compile/win32/Makefile b/compile/win32/Makefile index 09a4eb1..c4f7bdb 100644 --- a/compile/win32/Makefile +++ b/compile/win32/Makefile @@ -35,7 +35,8 @@ BALTISOT_SOURCES = \ ../../generic/lib/Handle.cc ../../generic/lib/String.cc \ ../../generic/lib/Input.cc ../../generic/lib/fileutils.cc \ ../../generic/lib/LuaHandle.cc ../../generic/lib/generic.cc \ -../../generic/lib/checkargs.c ../../generic/lib/datecalc.c +../../generic/lib/checkargs.c ../../generic/lib/datecalc.c \ +../../generic/lub/LuaConfigFile.cc ZLIB_SOURCES = \ ../../generic/lib/zlib/src/adler32.c ../../generic/lib/zlib/src/inffast.c \ |