Fixed up project files

This commit is contained in:
kode54 2012-08-22 04:49:04 +00:00
parent 1b5a49d5b1
commit de4922c339
4 changed files with 548 additions and 496 deletions

View File

@ -1,315 +0,0 @@
// This file is (modified) from
// FCEUX (2009)
// FCE Ultra - NES/Famicom Emulator
// Copyright (C) 2003 Xodnizel
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#ifndef _7ZIPSTREAMS_HEADER
#define _7ZIPSTREAMS_HEADER
#include "7z/CPP/Common/MyCom.h"
class ICountedSequentialOutStream : public ISequentialOutStream
{
public:
virtual UINT32 Size() const = 0;
};
class SeqMemoryOutStream : public ICountedSequentialOutStream, private CMyUnknownImp
{
UINT8* const output;
UINT32 pos;
const UINT32 size;
ULONG refCount;
HRESULT STDMETHODCALLTYPE QueryInterface(REFGUID, void**)
{
return E_NOINTERFACE;
}
HRESULT STDMETHODCALLTYPE Write(const void* data, UInt32 length, UInt32* bytesWritten)
{
if (data != NULL || size == 0)
{
//assert(length <= size - pos);
if (length > size - pos)
length = size - pos;
if(data)
memcpy(output + pos, data, length);
pos += length;
if (bytesWritten)
*bytesWritten = length;
return S_OK;
}
else
{
return E_INVALIDARG;
}
}
MY_ADDREF_RELEASE
public:
SeqMemoryOutStream(void* d, UINT32 s) : output((UINT8*)d), pos(0), size(s), refCount(0) {}
virtual ~SeqMemoryOutStream()
{
int a = 0;
}
UINT32 Size() const
{
return pos;
}
};
class SeqFileOutStream : public ICountedSequentialOutStream, private CMyUnknownImp
{
FILE* file;
UINT32 pos;
ULONG refCount;
HRESULT STDMETHODCALLTYPE QueryInterface(REFGUID, void**)
{
return E_NOINTERFACE;
}
HRESULT STDMETHODCALLTYPE Write(const void* data, UInt32 length, UInt32* bytesWritten)
{
if(!file)
return E_FAIL;
if (data != NULL)
{
int written = 0;
if(data)
written = fwrite(data, 1, length, file);
pos += written;
if (bytesWritten)
*bytesWritten = written;
return S_OK;
}
else
{
return E_INVALIDARG;
}
}
MY_ADDREF_RELEASE
public:
SeqFileOutStream(const char* outFilename) : pos(0), refCount(0)
{
file = fopen(outFilename, "wb");
}
virtual ~SeqFileOutStream()
{
if(file)
fclose(file);
}
UINT32 Size() const
{
return pos;
}
};
class OutStream : public IArchiveExtractCallback, private CMyUnknownImp
{
ICountedSequentialOutStream* seqStream;
const UINT32 index;
ULONG refCount;
HRESULT STDMETHODCALLTYPE QueryInterface(REFGUID, void**)
{
return E_NOINTERFACE;
}
HRESULT STDMETHODCALLTYPE PrepareOperation(Int32)
{
return S_OK;
}
HRESULT STDMETHODCALLTYPE SetTotal(UInt64)
{
return S_OK;
}
HRESULT STDMETHODCALLTYPE SetCompleted(const UInt64*)
{
return S_OK;
}
HRESULT STDMETHODCALLTYPE SetOperationResult(Int32)
{
return S_OK;
}
HRESULT STDMETHODCALLTYPE GetStream(UInt32 id, ISequentialOutStream** ptr, Int32 mode)
{
switch (mode)
{
case NArchive::NExtract::NAskMode::kExtract:
case NArchive::NExtract::NAskMode::kTest:
if (id != index || ptr == NULL)
return S_FALSE;
else
*ptr = seqStream;
// fall through
case NArchive::NExtract::NAskMode::kSkip:
return S_OK;
default:
return E_INVALIDARG;
}
}
MY_ADDREF_RELEASE
public:
OutStream(UINT32 index, void* data, UINT32 size) : index(index), refCount(0)
{
seqStream = new SeqMemoryOutStream(data, size);
seqStream->AddRef();
}
OutStream(UINT32 index, const char* outFilename) : index(index), refCount(0)
{
seqStream = new SeqFileOutStream(outFilename);
seqStream->AddRef();
}
virtual ~OutStream()
{
//seqStream->Release(); // commented out because apparently IInArchive::Extract() calls Release one more time than it calls AddRef
}
UINT32 Size() const
{
return seqStream->Size();
}
};
class InStream : public IInStream, private IStreamGetSize, private CMyUnknownImp
{
ULONG refCount;
HRESULT STDMETHODCALLTYPE QueryInterface(REFGUID, void**)
{
return E_NOINTERFACE;
}
HRESULT STDMETHODCALLTYPE GetSize(UInt64* outSize)
{
if (outSize)
{
*outSize = size;
return S_OK;
}
else
{
return E_INVALIDARG;
}
}
MY_ADDREF_RELEASE
protected:
UINT32 size;
public:
explicit InStream() : refCount(0) {}
virtual ~InStream() {}
};
class InFileStream : public InStream
{
public:
virtual ~InFileStream()
{
if(file)
fclose(file);
}
FILE* file;
InFileStream(const char* fname) : file(NULL)
{
file = fopen(fname, "rb");
if(file)
{
fseek(file, 0, SEEK_END);
size = ftell(file);
fseek(file, 0, SEEK_SET);
}
}
HRESULT STDMETHODCALLTYPE Read(void* data, UInt32 length, UInt32* bytesRead)
{
if(!file)
return E_FAIL;
if (data != NULL || length == 0)
{
int read = fread(data, 1, length, file);
if (bytesRead)
*bytesRead = read;
return S_OK;
}
else
{
return E_INVALIDARG;
}
}
HRESULT STDMETHODCALLTYPE Seek(Int64 offset, UInt32 origin, UInt64* pos)
{
if(!file)
return E_FAIL;
if (origin < 3)
{
fseek(file, (long)offset, origin);
origin = ftell(file);
if (pos)
*pos = origin;
return S_OK;
}
else
{
return E_INVALIDARG;
}
}
};
#endif

View File

@ -55,7 +55,7 @@
FavorSizeOrSpeed="0"
EnableFiberSafeOptimizations="false"
WholeProgramOptimization="false"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;.\wx\include"
PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;DEBUG;_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;_WIN32_WINNT=0x0501;_CRTDBG_MAPALLOC "
ExceptionHandling="1"
BasicRuntimeChecks="0"
@ -81,7 +81,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib libelf_libdwarf-vc8-Win32.lib glib-vc8-Win32.lib lua51.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib Rpcrt4.lib"
AdditionalDependencies="directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib libelf_libdwarf-vc8-Win32.lib glib-vc8-Win32.lib lua51.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib Rpcrt4.lib"
OutputFile="$(OutDir)\$(ProjectName)_debug.exe"
AdditionalLibraryDirectories=".\zlib123;agg;.libs;.libs\win32"
IgnoreDefaultLibraryNames="LIBCPMT"
@ -151,7 +151,7 @@
FavorSizeOrSpeed="0"
EnableFiberSafeOptimizations="false"
WholeProgramOptimization="false"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;.\wx\include"
PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;DEBUG;_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;_WIN32_WINNT=0x0501"
ExceptionHandling="1"
BasicRuntimeChecks="0"
@ -175,7 +175,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua51.lib glib-vc8-x64.lib 7z-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib"
AdditionalDependencies="directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua51.lib glib-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib"
OutputFile="$(OutDir)\$(ProjectName)_x64_debug.exe"
AdditionalLibraryDirectories=".\zlib123;agg;.libs\x64;.libs"
DelayLoadDLLs="lua51.dll"
@ -247,7 +247,7 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;.\wx\include"
PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;NDEBUG;RELEASE;_WIN32_WINNT=0x0501"
StringPooling="true"
ExceptionHandling="1"
@ -274,7 +274,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib libelf_libdwarf-vc8-Win32.lib lua51.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib Rpcrt4.lib"
AdditionalDependencies="directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib libelf_libdwarf-vc8-Win32.lib lua51.lib glib-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib Rpcrt4.lib"
OutputFile="$(OutDir)\$(ProjectName)_release.exe"
AdditionalLibraryDirectories=".\zlib123;agg;.libs;.libs\win32"
DelayLoadDLLs="lua51.dll"
@ -346,7 +346,7 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;.\wx\include"
PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;NDEBUG;RELEASE;_WIN32_WINNT=0x0501"
StringPooling="true"
ExceptionHandling="1"
@ -373,7 +373,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua51.lib glib-vc8-x64.lib 7z-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib lua-5.1.4-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib"
AdditionalDependencies="directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua51.lib glib-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib lua-5.1.4-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib"
OutputFile="$(OutDir)\$(ProjectName)_x64_release.exe"
AdditionalLibraryDirectories=".\zlib123;agg;.libs\x64;.libs"
DelayLoadDLLs="lua51.dll"
@ -446,7 +446,7 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="false"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;.\wx\include"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;NDEBUG;RELEASE;_WIN32_WINNT=0x0501;FASTBUILD"
StringPooling="true"
ExceptionHandling="1"
@ -474,7 +474,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib libelf_libdwarf-vc8-Win32.lib lua51.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib Rpcrt4.lib"
AdditionalDependencies="directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib libelf_libdwarf-vc8-Win32.lib lua51.lib glib-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib Rpcrt4.lib"
OutputFile="$(OutDir)\$(ProjectName)_releaseFastBuild.exe"
AdditionalLibraryDirectories=".\zlib123;agg;.libs;.libs\win32"
DelayLoadDLLs="lua51.dll"
@ -548,7 +548,7 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="false"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;.\wx\include"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;NDEBUG;RELEASE;FASTBUILD;_WIN32_WINNT=0x0501"
StringPooling="true"
ExceptionHandling="1"
@ -576,7 +576,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua51.lib glib-vc8-x64.lib 7z-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib"
AdditionalDependencies="directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua51.lib glib-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib"
OutputFile="$(OutDir)\$(ProjectName)_x64_releaseFastBuild.exe"
AdditionalLibraryDirectories=".\zlib123;agg;.libs\x64;.libs"
DelayLoadDLLs="lua51.dll"
@ -621,18 +621,262 @@
<Filter
Name="windows"
>
<File
RelativePath=".\7zip.cpp"
<Filter
Name="File_Extractor"
>
</File>
<File
RelativePath=".\7zip.h"
>
</File>
<File
RelativePath=".\7zipstreams.h"
>
</File>
<Filter
Name="7-Zip"
>
<File
RelativePath=".\File_Extractor\7z_C\7zAlloc.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\7zBuf.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\7zBuf2.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\7zCrc.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\7zCrcOpt.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\7zDec.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\7zFile.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\7zIn.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\7zStream.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Alloc.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Bcj2.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Bra.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Bra86.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\BraIA64.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\CpuArch.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Delta.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\LzFind.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\LzFindMt.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Lzma2Dec.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Lzma2Enc.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Lzma86Dec.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Lzma86Enc.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\LzmaDec.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\LzmaEnc.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\LzmaLib.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\MtCoder.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Ppmd7.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Ppmd7Dec.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Ppmd7Enc.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Threads.c"
>
</File>
</Filter>
<Filter
Name="unrar"
>
<File
RelativePath=".\File_Extractor\unrar\archive.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\arcread.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\coder.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\crc.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\encname.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\extract.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\getbits.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\model.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\rarvm.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\rarvmtbl.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\rawread.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\suballoc.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\unicode.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\unpack.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\unpack15.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\unpack20.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\unrar.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\unrar_misc.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\unrar_open.cpp"
>
</File>
</Filter>
<File
RelativePath=".\File_Extractor\fex\Binary_Extractor.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\blargg_common.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\blargg_errors.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\Data_Reader.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\fex.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\File_Extractor.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\Gzip_Extractor.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\Gzip_Reader.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\Rar_Extractor.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\Zip7_Extractor.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\Zip_Extractor.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\Zlib_Inflater.cpp"
>
</File>
</Filter>
<File
RelativePath=".\AboutBox.cpp"
>
@ -697,6 +941,10 @@
RelativePath=".\disView.h"
>
</File>
<File
RelativePath=".\FEX_Interface.cpp"
>
</File>
<File
RelativePath=".\FirmConfig.cpp"
>
@ -956,70 +1204,6 @@
<Filter
Name="libs"
>
<File
RelativePath=".\7z\7z.7z"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\7z.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\7z.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\7z.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\7z.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release FastBuild|Win32"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\7z.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release FastBuild|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\7z.tag"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\directx\directx.7z"
>

View File

@ -56,7 +56,7 @@
FavorSizeOrSpeed="0"
EnableFiberSafeOptimizations="false"
WholeProgramOptimization="false"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;.\wx\include"
PreprocessorDefinitions="DEBUG;_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;BETA_VERSION;NOMINMAX;HAVE_LIBZ"
ExceptionHandling="1"
BasicRuntimeChecks="3"
@ -78,7 +78,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib libelf_libdwarf-vc8-Win32.lib lua51.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib comctl32.lib"
AdditionalDependencies="directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib libelf_libdwarf-vc8-Win32.lib lua51.lib glib-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib comctl32.lib"
OutputFile="$(OutDir)\$(ProjectName)_debug.exe"
AdditionalLibraryDirectories=".\zlib123;agg;.libs;.libs\win32"
DelayLoadDLLs="lua51.dll"
@ -146,7 +146,7 @@
FavorSizeOrSpeed="0"
EnableFiberSafeOptimizations="false"
WholeProgramOptimization="false"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;.\wx\include"
PreprocessorDefinitions="DEBUG;_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;BETA_VERSION;NOMINMAX;HAVE_LIBZ"
ExceptionHandling="1"
BasicRuntimeChecks="3"
@ -168,7 +168,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib libelf_libdwarf-vc8-x64.lib lua51.lib glib-vc8-x64.lib 7z-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib"
AdditionalDependencies="directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib libelf_libdwarf-vc8-x64.lib lua51.lib glib-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib"
OutputFile="$(OutDir)\$(ProjectName)_x64_debug.exe"
AdditionalLibraryDirectories=".\zlib123;agg;.libs\x64;.libs"
DelayLoadDLLs="lua51.dll"
@ -238,7 +238,7 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;.\wx\include"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG"
StringPooling="true"
ExceptionHandling="1"
@ -262,7 +262,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib libelf_libdwarf-vc8-Win32.lib lua51.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib comctl32.lib"
AdditionalDependencies="directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib libelf_libdwarf-vc8-Win32.lib lua51.lib glib-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib comctl32.lib"
OutputFile="$(OutDir)\$(ProjectName)_release.exe"
AdditionalLibraryDirectories=".\zlib123;agg;.libs;.libs\win32"
DelayLoadDLLs="lua51.dll"
@ -333,7 +333,7 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;.\wx\include"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG"
StringPooling="true"
ExceptionHandling="1"
@ -357,7 +357,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib libelf_libdwarf-vc8-x64.lib lua51.lib glib-vc8-x64.lib 7z-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib"
AdditionalDependencies="directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib libelf_libdwarf-vc8-x64.lib lua51.lib glib-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib"
OutputFile="$(OutDir)\$(ProjectName)_x64_release.exe"
AdditionalLibraryDirectories=".\zlib123;agg;.libs\x64;.libs"
DelayLoadDLLs="lua51.dll"
@ -428,7 +428,7 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="false"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;.\wx\include"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;FASTBUILD;DEVELOPER"
StringPooling="true"
ExceptionHandling="1"
@ -452,7 +452,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib libelf_libdwarf-vc8-Win32.lib lua51.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib comctl32.lib"
AdditionalDependencies="directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib libelf_libdwarf-vc8-Win32.lib lua51.lib glib-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib comctl32.lib"
OutputFile="$(OutDir)\$(ProjectName)_dev+.exe"
AdditionalLibraryDirectories=".\zlib123;agg;.libs;.libs\win32"
DelayLoadDLLs="lua51.dll"
@ -524,7 +524,7 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="false"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include"
AdditionalIncludeDirectories=".;..;lua\include;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;.\wx\include"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;DEVELOPER"
StringPooling="true"
ExceptionHandling="1"
@ -548,7 +548,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib libelf_libdwarf-vc8-x64.lib lua51.lib glib-vc8-x64.lib 7z-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib"
AdditionalDependencies="directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib libelf_libdwarf-vc8-x64.lib lua51.lib glib-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib"
OutputFile="$(OutDir)\$(ProjectName)_x64_dev+.exe"
AdditionalLibraryDirectories=".\zlib123;agg;.libs\x64;.libs"
DelayLoadDLLs="lua51.dll"
@ -1634,18 +1634,262 @@
<Filter
Name="Windows"
>
<File
RelativePath=".\7zip.cpp"
<Filter
Name="File_Extractor"
>
</File>
<File
RelativePath=".\7zip.h"
>
</File>
<File
RelativePath=".\7zipstreams.h"
>
</File>
<Filter
Name="7-Zip"
>
<File
RelativePath=".\File_Extractor\7z_C\7zAlloc.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\7zBuf.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\7zBuf2.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\7zCrc.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\7zCrcOpt.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\7zDec.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\7zFile.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\7zIn.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\7zStream.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Alloc.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Bcj2.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Bra.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Bra86.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\BraIA64.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\CpuArch.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Delta.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\LzFind.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\LzFindMt.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Lzma2Dec.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Lzma2Enc.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Lzma86Dec.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Lzma86Enc.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\LzmaDec.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\LzmaEnc.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\LzmaLib.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\MtCoder.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Ppmd7.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Ppmd7Dec.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Ppmd7Enc.c"
>
</File>
<File
RelativePath=".\File_Extractor\7z_C\Threads.c"
>
</File>
</Filter>
<Filter
Name="unrar"
>
<File
RelativePath=".\File_Extractor\unrar\archive.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\arcread.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\coder.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\crc.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\encname.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\extract.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\getbits.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\model.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\rarvm.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\rarvmtbl.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\rawread.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\suballoc.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\unicode.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\unpack.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\unpack15.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\unpack20.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\unrar.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\unrar_misc.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\unrar\unrar_open.cpp"
>
</File>
</Filter>
<File
RelativePath=".\File_Extractor\fex\Binary_Extractor.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\blargg_common.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\blargg_errors.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\Data_Reader.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\fex.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\File_Extractor.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\Gzip_Extractor.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\Gzip_Reader.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\Rar_Extractor.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\Zip7_Extractor.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\Zip_Extractor.cpp"
>
</File>
<File
RelativePath=".\File_Extractor\fex\Zlib_Inflater.cpp"
>
</File>
</Filter>
<File
RelativePath=".\AboutBox.cpp"
>
@ -1698,6 +1942,10 @@
RelativePath=".\FirmConfig.cpp"
>
</File>
<File
RelativePath=".\FEX_Interface.cpp"
>
</File>
<File
RelativePath=".\FirmConfig.h"
>
@ -1961,70 +2209,6 @@
<Filter
Name="libs"
>
<File
RelativePath=".\7z\7z.7z"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\7z.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\7z.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\7z.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\7z.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Dev+|Win32"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\7z.tag"
/>
</FileConfiguration>
<FileConfiguration
Name="Release FastBuild|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="un7z_and_touch.bat 7z\7z.7z .libs\7z*&#x0D;&#x0A;"
AdditionalDependencies="7z.exe;un7z_and_touch.bat"
Outputs=".libs\7z.tag"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\directx\directx.7z"
>

View File

@ -170,7 +170,7 @@
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>.;..;lua\include;glib-2.20.1\build;glib-2.20.1\build\glib;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;..;lua\include;glib-2.20.1\build;glib-2.20.1\build\glib;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;.\wx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DEBUG;_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;BETA_VERSION;NOMINMAX;HAVE_LIBZ;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -210,7 +210,7 @@
<OmitFramePointers>true</OmitFramePointers>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>.;..;lua\include;glib-2.20.1\build;glib-2.20.1\build\glib;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;..;lua\include;glib-2.20.1\build;glib-2.20.1\build\glib;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;.\wx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Sync</ExceptionHandling>
@ -256,7 +256,7 @@
<OmitFramePointers>true</OmitFramePointers>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>.;..;lua\include;glib-2.20.1\build;glib-2.20.1\build\glib;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;..;lua\include;glib-2.20.1\build;glib-2.20.1\build\glib;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;.\wx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;FASTBUILD;DEVELOPER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Sync</ExceptionHandling>
@ -306,7 +306,7 @@
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>.;..;lua\include;glib-2.20.1\build;glib-2.20.1\build\glib;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;..;lua\include;glib-2.20.1\build;glib-2.20.1\build\glib;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;.\wx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DEBUG;_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;BETA_VERSION;NOMINMAX;HAVE_LIBZ;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -350,7 +350,7 @@
<OmitFramePointers>true</OmitFramePointers>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>.;..;lua\include;glib-2.20.1\build;glib-2.20.1\build\glib;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;..;lua\include;glib-2.20.1\build;glib-2.20.1\build\glib;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;.\wx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Sync</ExceptionHandling>
@ -397,7 +397,7 @@
<OmitFramePointers>true</OmitFramePointers>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>.;..;lua\include;glib-2.20.1\build;glib-2.20.1\build\glib;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;..;lua\include;glib-2.20.1\build;glib-2.20.1\build\glib;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;.\wx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;DEVELOPER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Sync</ExceptionHandling>
@ -813,7 +813,6 @@
<ClInclude Include="..\metaspu\SoundTouch\TDStretch.h" />
<ClInclude Include="..\metaspu\SoundTouch\WavFile.h" />
<ClInclude Include="..\wxdlg\wxdlg3dViewer.h" />
<ClInclude Include="7zipstreams.h" />
<ClInclude Include="AboutBox.h" />
<ClInclude Include="aviout.h" />
<ClInclude Include="cheatsWin.h" />