matthias/wc3re
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Port to Win32; Move sources to src/ subdir; Use precompiled headers

Browse Source
This commit is contained in:
Matthias Blankertz
2015-07-09 12:33:26 +02:00
parent ea701302ac
commit 86ba46667d
72 changed files with 1343 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -9,3 +9,4 @@ font2png
pntr2png pntr2png
treexplore treexplore
*.vcxproj.user *.vcxproj.user
*.gch

20
LICENSES
View File

@@ -70,3 +70,23 @@ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE. DEALINGS IN THE SOFTWARE.
Simple DirectMedia Layer
Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.

8
Makefile
View File

@@ -1,5 +1,5 @@
CXX=g++ CXX=g++
CXXOPTS=-Og -ggdb -fvar-tracking-assignments -Wall -Wextra -Wno-unused-function -pedantic -std=c++14 -march=native -fstack-protector-strong --param=ssp-buffer-size=4 -flto -I. -pthread CXXOPTS=-Og -ggdb -fvar-tracking-assignments -Wall -Winvalid-pch -Wextra -Wno-unused-function -pedantic -std=c++14 -march=native -fstack-protector-strong --param=ssp-buffer-size=4 -flto -Isrc -pthread
LDOPTS=-Wl,--sort-common LDOPTS=-Wl,--sort-common
render_CXXSRCS ::= render/Renderer.cc render/GlResource.cc render/ProgramProvider.cc render/renderutil.cc render/Overlay.cc render/VBOManager.cc render/Object.cc render/AlResource.cc render/AudioStream.cc render_CXXSRCS ::= render/Renderer.cc render/GlResource.cc render/ProgramProvider.cc render/renderutil.cc render/Overlay.cc render/VBOManager.cc render/Object.cc render/AlResource.cc render/AudioStream.cc
@@ -29,12 +29,12 @@ progs ::= iffexplore treexplore mvedecode objdecode shapdecode
all: $(progs) all: $(progs)
objs/%.o: %.cc objs/%.o: src/%.cc src/common.hh.gch
$(CXX) $(CXXOPTS) -c -MMD -MP -o $@ $< $(CXX) $(CXXOPTS) -c -MMD -MP -o $@ $<
@cp objs/$*.d objs/$*.P; rm -f objs/$*.d @cp objs/$*.d objs/$*.P; rm -f objs/$*.d
%.pb.cc %.pb.h: %.proto src/common.hh.gch: src/common.hh src/compiler.hh src/platform.hh src/exceptions.hh
protoc --cpp_out=. $< $(CXX) $(CXXOPTS) -c -o $@ $<
$(progs): %: $(progs): %:
$(CXX) $(CXXOPTS) $(LDOPTS) -o $@ $^ $($(@)_LIBS) $(CXX) $(CXXOPTS) $(LDOPTS) -o $@ $^ $($(@)_LIBS)

17
common.hh
View File

@@ -1,17 +0,0 @@
#ifndef WC3RE__COMMON_HH__
#define WC3RE__COMMON_HH__
#include <cstdio>
#include <memory>
struct FILEDeleter {
void operator()(FILE* file) const {
fclose(file);
}
};
using FILEUPtr = std::unique_ptr<FILE, FILEDeleter>;
#include "exceptions.hh"
#endif

121
iffexplore.vcxproj Normal file
View File

@@ -0,0 +1,121 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\common.cc">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\decompress.cc" />
<ClCompile Include="src\exceptions.cc" />
<ClCompile Include="src\iffexplore.cc" />
<ClCompile Include="src\IffFile.cc" />
<ClCompile Include="src\ResourceProvider.cc" />
<ClCompile Include="src\TreFile.cc" />
<ClCompile Include="src\util.cc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\common.hh" />
<ClInclude Include="src\compiler.hh" />
<ClInclude Include="src\decompress.hh" />
<ClInclude Include="src\exceptions.hh" />
<ClInclude Include="src\IffFile.hh" />
<ClInclude Include="src\platform.hh" />
<ClInclude Include="src\Resource.hh" />
<ClInclude Include="src\ResourceProvider.hh" />
<ClInclude Include="src\Singleton.hh" />
<ClInclude Include="src\TreFile.hh" />
<ClInclude Include="src\util.hh" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{23DC33B8-9A83-49C4-A2F4-0EC407CCD7E8}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>iffexplore</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IntDir>$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IntDir>$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<DisableSpecificWarnings>4101;4251</DisableSpecificWarnings>
<AdditionalIncludeDirectories>env\SDL2_ttf-2.0.12\include;env\SDL2-2.0.3\include;libs\wingetopt;env\glm;env\glbinding\include;env\openal-soft-1.16.0-bin\include</AdditionalIncludeDirectories>
<PrecompiledHeaderFile>common.hh</PrecompiledHeaderFile>
<AdditionalOptions>/Zm190</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;wingetopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<DisableSpecificWarnings>4101;4251</DisableSpecificWarnings>
<AdditionalIncludeDirectories>env\SDL2_ttf-2.0.12\include;env\SDL2-2.0.3\include;libs\wingetopt;env\glm;env\glbinding\include;env\openal-soft-1.16.0-bin\include</AdditionalIncludeDirectories>
<PrecompiledHeaderFile>common.hh</PrecompiledHeaderFile>
<AdditionalOptions>/Zm190</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;wingetopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

74
iffexplore.vcxproj.filters Normal file
View File

@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Header Files">
<UniqueIdentifier>{9d0923ce-d2f5-4368-b493-b775e9240a39}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Source Files">
<UniqueIdentifier>{64a1e02e-886d-42ab-8338-5f224ee4f7b9}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\common.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\decompress.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\exceptions.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\iffexplore.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\IffFile.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\ResourceProvider.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\TreFile.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\util.cc">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\common.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\compiler.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\decompress.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\exceptions.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\IffFile.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\platform.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Resource.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\ResourceProvider.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Singleton.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\TreFile.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\util.hh">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

144
mvedecode.vcxproj Normal file
View File

@@ -0,0 +1,144 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\common.cc">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\decompress.cc" />
<ClCompile Include="src\exceptions.cc" />
<ClCompile Include="src\game\GSMvePlay.cc" />
<ClCompile Include="src\IffFile.cc" />
<ClCompile Include="src\mvedecode.cc" />
<ClCompile Include="src\MveDecoder.cc" />
<ClCompile Include="src\render\AlResource.cc" />
<ClCompile Include="src\render\AudioStream.cc" />
<ClCompile Include="src\render\GlResource.cc" />
<ClCompile Include="src\render\Overlay.cc" />
<ClCompile Include="src\render\ProgramProvider.cc" />
<ClCompile Include="src\render\Renderer.cc" />
<ClCompile Include="src\render\renderutil.cc" />
<ClCompile Include="src\render\VBOManager.cc" />
<ClCompile Include="src\ResourceProvider.cc" />
<ClCompile Include="src\TreFile.cc" />
<ClCompile Include="src\util.cc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\common.hh" />
<ClInclude Include="src\compiler.hh" />
<ClInclude Include="src\decompress.hh" />
<ClInclude Include="src\exceptions.hh" />
<ClInclude Include="src\game\GameState.hh" />
<ClInclude Include="src\game\GSMvePlay.hh" />
<ClInclude Include="src\IffFile.hh" />
<ClInclude Include="src\MveDecoder.hh" />
<ClInclude Include="src\platform.hh" />
<ClInclude Include="src\render\AlResource.hh" />
<ClInclude Include="src\render\AudioStream.hh" />
<ClInclude Include="src\render\Drawable.hh" />
<ClInclude Include="src\render\GlResource.hh" />
<ClInclude Include="src\render\Overlay.hh" />
<ClInclude Include="src\render\ProgramProvider.hh" />
<ClInclude Include="src\render\Renderer.hh" />
<ClInclude Include="src\render\renderutil.hh" />
<ClInclude Include="src\render\sdlutil.hh" />
<ClInclude Include="src\render\VBOManager.hh" />
<ClInclude Include="src\Resource.hh" />
<ClInclude Include="src\ResourceProvider.hh" />
<ClInclude Include="src\Singleton.hh" />
<ClInclude Include="src\TreFile.hh" />
<ClInclude Include="src\util.hh" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{94524082-F925-415B-9ABC-D9C68CDCB01F}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>mvedecode</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IntDir>$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IntDir>$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>env\SDL2_ttf-2.0.12\include;env\SDL2-2.0.3\include;libs\wingetopt;env\glm;env\glbinding\include;env\openal-soft-1.16.0-bin\include;src</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4101;4251</DisableSpecificWarnings>
<AdditionalOptions>/Zm190</AdditionalOptions>
<PrecompiledHeaderFile>common.hh</PrecompiledHeaderFile>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>env\SDL2_ttf-2.0.12\lib\x86;env\SDL2-2.0.3\lib\x86;env\openal-soft-1.16.0-bin\libs\Win32;env\glbinding\lib;Debug</AdditionalLibraryDirectories>
<AdditionalDependencies>wingetopt.lib;SDL2.lib;SDL2_ttf.lib;OpenAL32.lib;glbindingd.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>env\SDL2_ttf-2.0.12\include;env\SDL2-2.0.3\include;libs\wingetopt;env\glm;env\glbinding\include;env\openal-soft-1.16.0-bin\include;src</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4101;4251</DisableSpecificWarnings>
<AdditionalOptions>/Zm190</AdditionalOptions>
<PrecompiledHeaderFile>common.hh</PrecompiledHeaderFile>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>env\SDL2_ttf-2.0.12\lib\x86;env\SDL2-2.0.3\lib\x86;env\openal-soft-1.16.0-bin\libs\Win32;env\glbinding\lib;Release</AdditionalLibraryDirectories>
<AdditionalDependencies>wingetopt.lib;SDL2.lib;SDL2_ttf.lib;OpenAL32.lib;glbinding.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

147
mvedecode.vcxproj.filters Normal file
View File

@@ -0,0 +1,147 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\common.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\decompress.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\exceptions.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\IffFile.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\mvedecode.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\MveDecoder.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\ResourceProvider.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\TreFile.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\util.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\game\GSMvePlay.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\render\AlResource.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\render\AudioStream.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\render\GlResource.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\render\Overlay.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\render\ProgramProvider.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\render\Renderer.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\render\renderutil.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\render\VBOManager.cc">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\common.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\compiler.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\decompress.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\exceptions.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\IffFile.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\MveDecoder.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\platform.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Resource.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\ResourceProvider.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Singleton.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\TreFile.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\util.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\game\GameState.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\game\GSMvePlay.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\AlResource.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\AudioStream.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\Drawable.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\GlResource.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\Overlay.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\ProgramProvider.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\Renderer.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\renderutil.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\sdlutil.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\VBOManager.hh">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

146
objdecode.vcxproj Normal file
View File

@@ -0,0 +1,146 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{E3B62A51-0886-47B3-95CA-906AC56CC1A8}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>objdecode</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IntDir>$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IntDir>$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<PrecompiledHeaderFile>common.hh</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>env\SDL2_ttf-2.0.12\include;env\SDL2-2.0.3\include;libs\wingetopt;env\glm;env\glbinding\include;env\openal-soft-1.16.0-bin\include;src</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4101;4251</DisableSpecificWarnings>
<AdditionalOptions>/Zm190</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>Debug;env\SDL2_ttf-2.0.12\lib\x86;env\SDL2-2.0.3\lib\x86;env\openal-soft-1.16.0-bin\libs\Win32;env\glbinding\lib;</AdditionalLibraryDirectories>
<AdditionalDependencies>glbindingd.lib;wingetopt.lib;SDL2.lib;SDL2_ttf.lib;OpenAL32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<PrecompiledHeaderFile>common.hh</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>env\SDL2_ttf-2.0.12\include;env\SDL2-2.0.3\include;libs\wingetopt;env\glm;env\glbinding\include;env\openal-soft-1.16.0-bin\include;src</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4101;4251</DisableSpecificWarnings>
<AdditionalOptions>/Zm190</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>Release;env\SDL2_ttf-2.0.12\lib\x86;env\SDL2-2.0.3\lib\x86;env\openal-soft-1.16.0-bin\libs\Win32;env\glbinding\lib;</AdditionalLibraryDirectories>
<AdditionalDependencies>glbinding.lib;wingetopt.lib;SDL2.lib;SDL2_ttf.lib;OpenAL32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="src\common.cc">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\decompress.cc" />
<ClCompile Include="src\exceptions.cc" />
<ClCompile Include="src\game\GSShowObject.cc" />
<ClCompile Include="src\IffFile.cc" />
<ClCompile Include="src\objdecode.cc" />
<ClCompile Include="src\ObjDecoder.cc" />
<ClCompile Include="src\PaletteDecoder.cc" />
<ClCompile Include="src\render\AlResource.cc" />
<ClCompile Include="src\render\GlResource.cc" />
<ClCompile Include="src\render\Object.cc" />
<ClCompile Include="src\render\Overlay.cc" />
<ClCompile Include="src\render\ProgramProvider.cc" />
<ClCompile Include="src\render\Renderer.cc" />
<ClCompile Include="src\render\renderutil.cc" />
<ClCompile Include="src\render\VBOManager.cc" />
<ClCompile Include="src\ResourceProvider.cc" />
<ClCompile Include="src\TreFile.cc" />
<ClCompile Include="src\util.cc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\common.hh" />
<ClInclude Include="src\compiler.hh" />
<ClInclude Include="src\decompress.hh" />
<ClInclude Include="src\exceptions.hh" />
<ClInclude Include="src\game\GameState.hh" />
<ClInclude Include="src\game\GSShowObject.hh" />
<ClInclude Include="src\IffFile.hh" />
<ClInclude Include="src\ObjDecoder.hh" />
<ClInclude Include="src\PaletteDecoder.hh" />
<ClInclude Include="src\platform.hh" />
<ClInclude Include="src\render\AlResource.hh" />
<ClInclude Include="src\render\Drawable.hh" />
<ClInclude Include="src\render\GlResource.hh" />
<ClInclude Include="src\render\Object.hh" />
<ClInclude Include="src\render\Overlay.hh" />
<ClInclude Include="src\render\ProgramProvider.hh" />
<ClInclude Include="src\render\Renderer.hh" />
<ClInclude Include="src\render\renderutil.hh" />
<ClInclude Include="src\render\sdlutil.hh" />
<ClInclude Include="src\render\VBOManager.hh" />
<ClInclude Include="src\Resource.hh" />
<ClInclude Include="src\ResourceProvider.hh" />
<ClInclude Include="src\Singleton.hh" />
<ClInclude Include="src\TreFile.hh" />
<ClInclude Include="src\util.hh" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

153
objdecode.vcxproj.filters Normal file
View File

@@ -0,0 +1,153 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\common.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\decompress.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\exceptions.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\IffFile.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\objdecode.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\ObjDecoder.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\PaletteDecoder.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\ResourceProvider.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\TreFile.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\util.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\game\GSShowObject.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\render\AlResource.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\render\GlResource.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\render\Object.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\render\Overlay.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\render\ProgramProvider.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\render\Renderer.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\render\renderutil.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\render\VBOManager.cc">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\common.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\compiler.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\decompress.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\exceptions.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\IffFile.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\ObjDecoder.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\PaletteDecoder.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\platform.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Resource.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\ResourceProvider.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Singleton.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\TreFile.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\util.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\game\GameState.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\game\GSShowObject.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\AlResource.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\Drawable.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\GlResource.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\Object.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\Overlay.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\ProgramProvider.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\Renderer.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\renderutil.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\sdlutil.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\render\VBOManager.hh">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

123
shapdecode.vcxproj Normal file
View File

@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{5C417180-437D-4B93-92F2-1E6E6438573A}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>shapdecode</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IntDir>$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IntDir>$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<PrecompiledHeaderFile>common.hh</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>env\SDL2_ttf-2.0.12\include;env\SDL2-2.0.3\include;libs\wingetopt;env\glm;env\glbinding\include;env\openal-soft-1.16.0-bin\include</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4101;4251</DisableSpecificWarnings>
<AdditionalOptions>/Zm190</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;wingetopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>Debug/</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<PrecompiledHeaderFile>common.hh</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>env\SDL2_ttf-2.0.12\include;env\SDL2-2.0.3\include;libs\wingetopt;env\glm;env\glbinding\include;env\openal-soft-1.16.0-bin\include</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4101;4251</DisableSpecificWarnings>
<AdditionalOptions>/Zm190</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;wingetopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>Release/</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="src\common.cc">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\decompress.cc" />
<ClCompile Include="src\exceptions.cc" />
<ClCompile Include="src\IffFile.cc" />
<ClCompile Include="src\ResourceProvider.cc" />
<ClCompile Include="src\shapdecode.cc" />
<ClCompile Include="src\ShapDecoder.cc" />
<ClCompile Include="src\TreFile.cc" />
<ClCompile Include="src\util.cc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\common.hh" />
<ClInclude Include="src\compiler.hh" />
<ClInclude Include="src\decompress.hh" />
<ClInclude Include="src\exceptions.hh" />
<ClInclude Include="src\IffFile.hh" />
<ClInclude Include="src\platform.hh" />
<ClInclude Include="src\Resource.hh" />
<ClInclude Include="src\ResourceProvider.hh" />
<ClInclude Include="src\ShapDecoder.hh" />
<ClInclude Include="src\Singleton.hh" />
<ClInclude Include="src\TreFile.hh" />
<ClInclude Include="src\util.hh" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

80
shapdecode.vcxproj.filters Normal file
View File

@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\common.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\decompress.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\exceptions.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\IffFile.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\ResourceProvider.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\shapdecode.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\ShapDecoder.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\TreFile.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\util.cc">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\common.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\compiler.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\decompress.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\exceptions.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\IffFile.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\platform.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Resource.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\ResourceProvider.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\ShapDecoder.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Singleton.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\TreFile.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\util.hh">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

3
IffFile.cc → src/IffFile.cc
View File

@@ -1,8 +1,7 @@
#include <cstring> #include "common.hh"
#include "IffFile.hh" #include "IffFile.hh"
#include "util.hh" #include "util.hh"
#include "common.hh"
struct ChunkHeader { struct ChunkHeader {
unsigned char typeID[4]; unsigned char typeID[4];

6
IffFile.hh → src/IffFile.hh
View File

@@ -1,12 +1,6 @@
#ifndef WC3RE_IFFFILE_HH__ #ifndef WC3RE_IFFFILE_HH__
#define WC3RE_IFFFILE_HH__ #define WC3RE_IFFFILE_HH__
#include <cstddef>
#include <string>
#include <vector>
#include <memory>
#include <typeinfo>
#include "Resource.hh" #include "Resource.hh"
class IffFile : public RefCounted { class IffFile : public RefCounted {

7
MveDecoder.cc → src/MveDecoder.cc
View File

@@ -1,8 +1,5 @@
#include <algorithm>
#include <cstring>
#include "common.hh" #include "common.hh"
#include "compiler.hh"
#include "util.hh" #include "util.hh"
#include "IffFile.hh" #include "IffFile.hh"
#include "decompress.hh" #include "decompress.hh"
@@ -222,7 +219,7 @@ MveDecoder::Movie::Movie(std::vector<Shot>::const_iterator shotIt,
MveDecoder::Movie::~Movie() MveDecoder::Movie::~Movie()
{ {
#ifndef NDEBUG #ifndef NDEBUG
printf("Maximum command buffer: %zu\n", maxCommand_); printf("Maximum command buffer: " SIZE_T_FORMAT "\n", maxCommand_);
#endif #endif
} }

3
MveDecoder.hh → src/MveDecoder.hh
View File

@@ -1,9 +1,6 @@
#ifndef WC3RE_MVEDECODER_HH__ #ifndef WC3RE_MVEDECODER_HH__
#define WC3RE_MVEDECODER_HH__ #define WC3RE_MVEDECODER_HH__
#include <vector>
#include <array>
#include "IffFile.hh" #include "IffFile.hh"
class MveDecoder { class MveDecoder {

3
ObjDecoder.cc → src/ObjDecoder.cc
View File

@@ -1,7 +1,6 @@
#include <cassert> #include "common.hh"
#include "ObjDecoder.hh" #include "ObjDecoder.hh"
#include "exceptions.hh"
#include "util.hh" #include "util.hh"
#include "ResourceProvider.hh" #include "ResourceProvider.hh"

5
ObjDecoder.hh → src/ObjDecoder.hh
View File

@@ -1,11 +1,6 @@
#ifndef WC3RE_OBJDECODER_HH__ #ifndef WC3RE_OBJDECODER_HH__
#define WC3RE_OBJDECODER_HH__ #define WC3RE_OBJDECODER_HH__
#include <string>
#include <cstdint>
#include <vector>
#include <array>
#include "IffFile.hh" #include "IffFile.hh"
class ObjDecoder { class ObjDecoder {

3
PaletteDecoder.cc → src/PaletteDecoder.cc
View File

@@ -1,7 +1,6 @@
#include <algorithm> #include "common.hh"
#include "PaletteDecoder.hh" #include "PaletteDecoder.hh"
#include "exceptions.hh"
#include "ResourceProvider.hh" #include "ResourceProvider.hh"
PaletteDecoder::PaletteDecoder(std::string const& path) PaletteDecoder::PaletteDecoder(std::string const& path)

3
PaletteDecoder.hh → src/PaletteDecoder.hh
View File

@@ -1,9 +1,6 @@
#ifndef WC3RE_PALETTEDECODER_HH__ #ifndef WC3RE_PALETTEDECODER_HH__
#define WC3RE_PALETTEDECODER_HH__ #define WC3RE_PALETTEDECODER_HH__
#include <cstdint>
#include <array>
#include "IffFile.hh" #include "IffFile.hh"
class PaletteDecoder { class PaletteDecoder {

9
Resource.hh → src/Resource.hh
View File

@@ -1,13 +1,6 @@
#ifndef WC3RE_RESOURCE_HH__ #ifndef WC3RE_RESOURCE_HH__
#define WC3RE_RESOURCE_HH__ #define WC3RE_RESOURCE_HH__
#include <cstdint>
#include <cstddef>
#include <string>
#include <memory>
#include <atomic>
#include <cassert>
class RefCounted { class RefCounted {
public: public:
RefCounted() : ref_(0) { RefCounted() : ref_(0) {
@@ -81,7 +74,7 @@ public:
} }
operator bool() const { operator bool() const {
return res_; return (res_ != nullptr);
} }
Resource& operator*() { Resource& operator*() {

13
ResourceProvider.cc → src/ResourceProvider.cc
View File

@@ -1,10 +1,9 @@
#include <algorithm> #include "common.hh"
#include "Resource.hh" #include "Resource.hh"
#include "exceptions.hh"
#include "util.hh" #include "util.hh"
#include "IffFile.hh" #include "IffFile.hh"
//#include "TreFile.hh" #include "TreFile.hh"
#include "ResourceProvider.hh" #include "ResourceProvider.hh"
template<> template<>
@@ -30,22 +29,22 @@ ResourceProvider::~ResourceProvider()
void ResourceProvider::dumpCache_() const void ResourceProvider::dumpCache_() const
{ {
for (auto& iff: iffs_) { for (auto& iff: iffs_) {
printf("IFF: %s: %u users, %zu size\n", iff.first.c_str(), iff.second->getRef(), printf("IFF: %s: %u users, " SIZE_T_FORMAT " size\n", iff.first.c_str(), iff.second->getRef(),
iff.second->footprint()); iff.second->footprint());
} }
for (auto& treObj: treObjs_) { for (auto& treObj: treObjs_) {
printf("TRE-Obj: %s: %u users, %zu size\n", treObj.first.c_str(), treObj.second->getRef(), printf("TRE-Obj: %s: %u users, " SIZE_T_FORMAT " size\n", treObj.first.c_str(), treObj.second->getRef(),
treObj.second->footprint()); treObj.second->footprint());
} }
for (auto& tre: tres_) { for (auto& tre: tres_) {
printf("TRE: %s: %u users, %zu size\n", tre.first.c_str(), tre.second->getRef(), printf("TRE: %s: %u users, " SIZE_T_FORMAT " size\n", tre.first.c_str(), tre.second->getRef(),
tre.second->footprint()); tre.second->footprint());
} }
for (auto& mmap: files_) { for (auto& mmap: files_) {
printf("File: %s: %u users, %zu size\n", mmap.first.c_str(), mmap.second->getRef(), printf("File: %s: %u users, " SIZE_T_FORMAT " size\n", mmap.first.c_str(), mmap.second->getRef(),
mmap.second->footprint()); mmap.second->footprint());
} }
} }

3
ResourceProvider.hh → src/ResourceProvider.hh
View File

@@ -1,9 +1,6 @@
#ifndef WC3RE_RESOURCEPROVIDER_HH__ #ifndef WC3RE_RESOURCEPROVIDER_HH__
#define WC3RE_RESOURCEPROVIDER_HH__ #define WC3RE_RESOURCEPROVIDER_HH__
#include <unordered_map>
#include <memory>
#include "Singleton.hh" #include "Singleton.hh"
#include "TreFile.hh" #include "TreFile.hh"
#include "IffFile.hh" #include "IffFile.hh"

9
ShapDecoder.cc → src/ShapDecoder.cc
View File

@@ -1,9 +1,4 @@
#include <cstring> #include "common.hh"
#include <vector>
#include <map>
#include <algorithm>
#include <exceptions.hh>
#include "util.hh" #include "util.hh"
#include "Resource.hh" #include "Resource.hh"
@@ -81,5 +76,5 @@ ShapDecoder::ShapDecoder(Resource::Handle res)
printf("\t%.4x: %u\n", ent.first, ent.second); printf("\t%.4x: %u\n", ent.first, ent.second);
} }
printf("\t%zu bytes of data\n", res_->size()-(lastofs+24)); printf("\t" SIZE_T_FORMAT " bytes of data\n", res_->size()-(lastofs+24));
} }

2
ShapDecoder.hh → src/ShapDecoder.hh
View File

@@ -1,8 +1,6 @@
#ifndef WC3RE_SHAPDECODER_HH__ #ifndef WC3RE_SHAPDECODER_HH__
#define WC3RE_SHAPDECODER_HH__ #define WC3RE_SHAPDECODER_HH__
#include <cstddef>
class Resource; class Resource;
class ShapDecoder { class ShapDecoder {

3
Singleton.hh → src/Singleton.hh
View File

@@ -1,9 +1,6 @@
#ifndef WC3RE_SINGLETON_HH__ #ifndef WC3RE_SINGLETON_HH__
#define WC3RE_SINGLETON_HH__ #define WC3RE_SINGLETON_HH__
#include <memory>
#include <mutex>
template<typename T> template<typename T>
class Singleton { class Singleton {
public: public:

12
TreFile.cc → src/TreFile.cc
View File

@@ -1,13 +1,5 @@
#include <cstdio>
#include <cstdint>
#include <cstring>
#include <limits>
#ifdef WIN32
#define snprintf _snprintf
#endif
#include "common.hh" #include "common.hh"
#include "util.hh" #include "util.hh"
#include "decompress.hh" #include "decompress.hh"
#include "TreFile.hh" #include "TreFile.hh"
@@ -247,7 +239,7 @@ std::unique_ptr<TreFile::Object> TreFile::getObject(std::string const& spec) con
if (crc <= std::numeric_limits<uint32_t>::max()) { if (crc <= std::numeric_limits<uint32_t>::max()) {
try { try {
return openCRC(crc); return openCRC(static_cast<uint32_t>(crc));
} catch (Exception &ex) { } catch (Exception &ex) {
} }
} }

6
TreFile.hh → src/TreFile.hh
View File

@@ -1,12 +1,6 @@
#ifndef WC3RE_TREFILE_HH__ #ifndef WC3RE_TREFILE_HH__
#define WC3RE_TREFILE_HH__ #define WC3RE_TREFILE_HH__
#include <map>
#include <string>
#include <cstdio>
#include <vector>
#include <tuple>
#include "Resource.hh" #include "Resource.hh"
class TreFile : public RefCounted { class TreFile : public RefCounted {

1
src/common.cc Normal file
View File

@@ -0,0 +1 @@
#include "common.hh"

62
src/common.hh Normal file
View File

@@ -0,0 +1,62 @@
#ifndef WC3RE__COMMON_HH__
#define WC3RE__COMMON_HH__
#include <cstdio>
#include <memory>
#include <cstdint>
#include <string>
#include <stdexcept>
#include <cstring>
#include <sys/types.h>
#include <sys/stat.h>
#include <cerrno>
#include <vector>
#include <limits>
#include <map>
#include <tuple>
#include <cstddef>
#include <typeinfo>
#include <unordered_map>
#include <algorithm>
#include <atomic>
#include <cassert>
#include <mutex>
#include <list>
#include <set>
#include <array>
#include <glbinding/gl/gl.h>
#include <glbinding/Binding.h>
#include <glbinding/callbacks.h>
#include <glbinding/Meta.h>
#define GLM_FORCE_RADIANS
#include <glm/glm.hpp>
#include <glm/gtx/transform.hpp>
#include <glm/gtc/type_ptr.hpp>
#include <glm/gtc/packing.hpp>
#include <AL/al.h>
#include <AL/alc.h>
#ifdef WIN32
#define NOMINMAX
#include <Windows.h>
#include "getopt.h"
#include <SDL.h>
#include <SDL_ttf.h>
#undef main
#else
#include <sys/mman.h>
#include <unistd.h>
#include <SDL2/SDL.h>
#include <SDL2/SDL_ttf.h>
#endif
#include "compiler.hh"
#include "platform.hh"
#include "exceptions.hh"
#endif

6
compiler.hh → src/compiler.hh
View File

@@ -3,11 +3,17 @@
#ifdef __GNUG__ #ifdef __GNUG__
#define RESTRICT __restrict__ #define RESTRICT __restrict__
#define NO_EXCEPT noexcept
#define SIZE_T_FORMAT "%zu"
#else #else
#ifdef _MSC_VER #ifdef _MSC_VER
#define RESTRICT __restrict #define RESTRICT __restrict
#define NO_EXCEPT _NOEXCEPT
#define SIZE_T_FORMAT "%Iu"
#else #else
#define RESTRICT #define RESTRICT
#define NO_EXCEPT
#define SIZE_T_FORMAT "%zu"
#endif #endif
#endif #endif

5
decompress.cc → src/decompress.cc
View File

@@ -1,8 +1,5 @@
#include <unordered_map>
#include <algorithm>
#include "common.hh" #include "common.hh"
#include "compiler.hh"
#include "util.hh" #include "util.hh"
#include "decompress.hh" #include "decompress.hh"

3
decompress.hh → src/decompress.hh
View File

@@ -1,9 +1,6 @@
#ifndef WC3RE_DECOMPRESS_HH__ #ifndef WC3RE_DECOMPRESS_HH__
#define WC3RE_DECOMPRESS_HH__ #define WC3RE_DECOMPRESS_HH__
#include <cstdint>
#include <vector>
/* Decompression routines for various proprietary compression formats found in /* Decompression routines for various proprietary compression formats found in
WC3 */ WC3 */

5
exceptions.cc → src/exceptions.cc
View File

@@ -1,7 +1,4 @@
#include <cstring> #include "common.hh"
#include <cerrno>
#include "exceptions.hh"
Exception::Exception(std::string msg) Exception::Exception(std::string msg)
: msg_(std::move(msg)) : msg_(std::move(msg))

5
exceptions.hh → src/exceptions.hh
View File

@@ -1,8 +1,6 @@
#ifndef WC3RE_EXCEPTIONS_HH__ #ifndef WC3RE_EXCEPTIONS_HH__
#define WC3RE_EXCEPTIONS_HH__ #define WC3RE_EXCEPTIONS_HH__
#include <string>
class Exception { class Exception {
public: public:
Exception(std::string msg = ""); Exception(std::string msg = "");
@@ -41,9 +39,6 @@ private:
}; };
#ifdef WIN32 #ifdef WIN32
#define NOMINMAX
#include <Windows.h>
class Win32Exception : public Exception { class Win32Exception : public Exception {
public: public:
Win32Exception(DWORD err, std::string msg = ""); Win32Exception(DWORD err, std::string msg = "");

0
font2png.cc → src/font2png.cc
View File

3
game/GSMvePlay.cc → src/game/GSMvePlay.cc
View File

@@ -1,5 +1,6 @@
#include "MveDecoder.hh" #include "common.hh"
#include "MveDecoder.hh"
#include "GSMvePlay.hh" #include "GSMvePlay.hh"
#include "render/Overlay.hh" #include "render/Overlay.hh"
#include "render/Renderer.hh" #include "render/Renderer.hh"

0
game/GSMvePlay.hh → src/game/GSMvePlay.hh
View File

2
game/GSShowObject.cc → src/game/GSShowObject.cc
View File

@@ -1,4 +1,4 @@
#include <glm/gtx/transform.hpp> #include "common.hh"
#include "ObjDecoder.hh" #include "ObjDecoder.hh"

0
game/GSShowObject.hh → src/game/GSShowObject.hh
View File

2
game/GameState.hh → src/game/GameState.hh
View File

@@ -1,8 +1,6 @@
#ifndef WC3RE_GAME_GAMESTATE_HH__ #ifndef WC3RE_GAME_GAMESTATE_HH__
#define WC3RE_GAME_GAMESTATE_HH__ #define WC3RE_GAME_GAMESTATE_HH__
#include <SDL2/SDL.h>
namespace render { namespace render {
class Renderer; class Renderer;
} }

9
iffexplore.cc → src/iffexplore.cc
View File

@@ -1,12 +1,5 @@
#include <cstdio>
#include <cstring>
#include <cerrno>
#include <cstdint>
#include <vector>
#include <unistd.h>
#include "common.hh" #include "common.hh"
#include "util.hh" #include "util.hh"
#include "ResourceProvider.hh" #include "ResourceProvider.hh"
#include "IffFile.hh" #include "IffFile.hh"

22
mvedecode.cc → src/mvedecode.cc
View File

@@ -1,13 +1,5 @@
#include <cstdio>
#include <cstring>
#include <cerrno>
#include <cstdint>
#include <memory>
#include <limits>
#include <unistd.h>
#include "common.hh" #include "common.hh"
#include "util.hh" #include "util.hh"
#include "MveDecoder.hh" #include "MveDecoder.hh"
#include "render/Renderer.hh" #include "render/Renderer.hh"
@@ -16,19 +8,20 @@
using render::Renderer; using render::Renderer;
void usage(char *argv0) { void usage(char *argv0) {
fprintf(stderr, "Usage: %s [-h] (tre-file name/crc)/iff-file\n", argv0); fprintf(stderr, "Usage: %s [-hf] [-p [id]] (tre-file name/crc)/iff-file\n", argv0);
fprintf(stderr, "\tAttempt to decode the movie stored in iff-file, or in the\n\tiff-object \"name\"/\"crc\" contained in tre-file\n"); fprintf(stderr, "\tAttempt to decode the movie stored in iff-file, or in the\n\tiff-object \"name\"/\"crc\" contained in tre-file\n");
fprintf(stderr, "\t-p [id]\tPlay branch id, or all branches if no id given\n"); fprintf(stderr, "\t-p [id]\tPlay branch id, or all branches if no id given\n");
fprintf(stderr, "\t-f\tPlay video in fullscreen\n");
fprintf(stderr, "\t-h\tPrint this help\n"); fprintf(stderr, "\t-h\tPrint this help\n");
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
std::string inPath; std::string inPath;
int branch = -1; int branch = -1;
bool play = false; bool play = false, fullscreen = false;
{ {
int opt; int opt;
while ((opt = getopt(argc, argv, "hp::")) != -1) { while ((opt = getopt(argc, argv, "hp::f")) != -1) {
switch (opt) { switch (opt) {
case 'h': case 'h':
usage(argv[0]); usage(argv[0]);
@@ -43,6 +36,9 @@ int main(int argc, char *argv[]) {
} }
} }
break; break;
case 'f':
fullscreen = true;
break;
default: default:
usage(argv[0]); usage(argv[0]);
return 1; return 1;
@@ -61,7 +57,7 @@ int main(int argc, char *argv[]) {
auto mve = std::make_unique<MveDecoder>(inPath); auto mve = std::make_unique<MveDecoder>(inPath);
if (play) { if (play) {
Renderer renderer; Renderer renderer(fullscreen);
if (branch >= 0) { if (branch >= 0) {
auto movie = mve->open(branch); auto movie = mve->open(branch);

10
objdecode.cc → src/objdecode.cc
View File

@@ -1,13 +1,5 @@
#include <cstdio>
#include <cstring>
#include <cerrno>
#include <cstdint>
#include <memory>
#include <limits>
#include <unistd.h>
#include "common.hh" #include "common.hh"
#include "util.hh" #include "util.hh"
#include "TreFile.hh" #include "TreFile.hh"
#include "IffFile.hh" #include "IffFile.hh"

10
src/platform.hh Normal file
View File

@@ -0,0 +1,10 @@
#ifndef WC3RE_PLATFORM_HH_
#define WC3RE_PLATFORM_HH_
#ifdef WIN32
#define snprintf _snprintf
#else
#endif
#endif

2
render/AlResource.cc → src/render/AlResource.cc
View File

@@ -1,3 +1,5 @@
#include "common.hh"
#include "AlResource.hh" #include "AlResource.hh"
namespace render { namespace render {

4
render/AlResource.hh → src/render/AlResource.hh
View File

@@ -1,10 +1,6 @@
#ifndef WC3RE_RENDER_ALRESOURCE_HH__ #ifndef WC3RE_RENDER_ALRESOURCE_HH__
#define WC3RE_RENDER_ALRESOURCE_HH__ #define WC3RE_RENDER_ALRESOURCE_HH__
#include <AL/al.h>
#include <AL/alc.h>
#include <memory>
#include "GlResource.hh" #include "GlResource.hh"
namespace render { namespace render {

5
render/AudioStream.cc → src/render/AudioStream.cc
View File

@@ -1,5 +1,6 @@
#include "common.hh"
#include "AudioStream.hh" #include "AudioStream.hh"
#include "exceptions.hh"
namespace render { namespace render {
AudioStream::AudioStream() AudioStream::AudioStream()
@@ -12,7 +13,7 @@ namespace render {
AudioStream::~AudioStream() AudioStream::~AudioStream()
{ {
#ifndef NDEBUG #ifndef NDEBUG
printf("%zu buffers at destruction\n", alBufs_.size()); printf(SIZE_T_FORMAT " buffers at destruction\n", alBufs_.size());
#endif #endif
} }

2
render/AudioStream.hh → src/render/AudioStream.hh
View File

@@ -1,8 +1,6 @@
#ifndef WC3RE_RENDER_AUDIOSTREAM_HH__ #ifndef WC3RE_RENDER_AUDIOSTREAM_HH__
#define WC3RE_RENDER_AUDIOSTREAM_HH__ #define WC3RE_RENDER_AUDIOSTREAM_HH__
#include <vector>
#include "AlResource.hh" #include "AlResource.hh"
namespace render { namespace render {

0
render/Drawable.hh → src/render/Drawable.hh
View File

2
render/GlResource.cc → src/render/GlResource.cc
View File

@@ -1,4 +1,4 @@
#include <glbinding/gl/gl.h> #include "common.hh"
#include "GlResource.hh" #include "GlResource.hh"

2
render/GlResource.hh → src/render/GlResource.hh
View File

@@ -1,8 +1,6 @@
#ifndef WC3RE_RENDER_GLRESOURCE_HH__ #ifndef WC3RE_RENDER_GLRESOURCE_HH__
#define WC3RE_RENDER_GLRESOURCE_HH__ #define WC3RE_RENDER_GLRESOURCE_HH__
#include <glbinding/gl/types.h>
namespace render { namespace render {
struct TextureDeleter { struct TextureDeleter {
void operator() (gl::GLuint tex) const; void operator() (gl::GLuint tex) const;

8
render/Object.cc → src/render/Object.cc
View File

@@ -1,10 +1,4 @@
#include <set> #include "common.hh"
#include <glbinding/gl/gl.h>
#include <glm/gtx/transform.hpp>
#include <glm/gtc/type_ptr.hpp>
#include <glm/gtc/packing.hpp>
#include "Object.hh" #include "Object.hh"
#include "ProgramProvider.hh" #include "ProgramProvider.hh"

3
render/Object.hh → src/render/Object.hh
View File

@@ -1,9 +1,6 @@
#ifndef WC3RE_RENDER_OBJECT_HH__ #ifndef WC3RE_RENDER_OBJECT_HH__
#define WC3RE_RENDER_OBJECT_HH__ #define WC3RE_RENDER_OBJECT_HH__
#define GLM_FORCE_RADIANS
#include <glm/glm.hpp>
#include "Drawable.hh" #include "Drawable.hh"
#include "GlResource.hh" #include "GlResource.hh"
#include "VBOManager.hh" #include "VBOManager.hh"

8
render/Overlay.cc → src/render/Overlay.cc
View File

@@ -1,8 +1,4 @@
#include <glbinding/gl/gl.h> #include "common.hh"
#include <SDL2/SDL.h>
#include <glm/gtx/transform.hpp>
#include <glm/gtc/type_ptr.hpp>
#include "Overlay.hh" #include "Overlay.hh"
#include "renderutil.hh" #include "renderutil.hh"
@@ -73,7 +69,7 @@ namespace render {
// void Overlay::clear() // void Overlay::clear()
// { // {
// if (SDL_GL_ExtensionSupported("GL_ARB_clear_texture")) // if (extensionSupported("GL_ARB_clear_texture"))
// glClearTexImage(texture_, 0, GL_BGRA, GL_UNSIGNED_BYTE, nullptr); // glClearTexImage(texture_, 0, GL_BGRA, GL_UNSIGNED_BYTE, nullptr);
// else { // else {
// std::vector<uint8_t> zeros(intWidth_*intHeight_*4, 0u); // std::vector<uint8_t> zeros(intWidth_*intHeight_*4, 0u);

5
render/Overlay.hh → src/render/Overlay.hh
View File

@@ -1,11 +1,6 @@
#ifndef WC3RE_RENDER_OVERLAY_HH__ #ifndef WC3RE_RENDER_OVERLAY_HH__
#define WC3RE_RENDER_OVERLAY_HH__ #define WC3RE_RENDER_OVERLAY_HH__
#include <SDL2/SDL.h>
#define GLM_FORCE_RADIANS
#include <glm/glm.hpp>
#include "Drawable.hh" #include "Drawable.hh"
#include "GlResource.hh" #include "GlResource.hh"
#include "VBOManager.hh" #include "VBOManager.hh"

4
render/ProgramProvider.cc → src/render/ProgramProvider.cc
View File

@@ -1,8 +1,8 @@
#include <mutex> #include "common.hh"
#include <glbinding/gl/gl.h> #include <glbinding/gl/gl.h>
#include "ProgramProvider.hh" #include "ProgramProvider.hh"
#include "exceptions.hh"
#include "util.hh" #include "util.hh"
using namespace gl; using namespace gl;

3
render/ProgramProvider.hh → src/render/ProgramProvider.hh
View File

@@ -1,10 +1,9 @@
#ifndef WC3RE_RENDER_PROGRAMPROVIDER_HH__ #ifndef WC3RE_RENDER_PROGRAMPROVIDER_HH__
#define WC3RE_RENDER_PROGRAMPROVIDER_HH__ #define WC3RE_RENDER_PROGRAMPROVIDER_HH__
#include <unordered_map>
#include "Singleton.hh" #include "Singleton.hh"
#include "GlResource.hh" #include "GlResource.hh"
namespace render { namespace render {
using ProgramProviderKeyType = std::tuple<std::string, std::string>; using ProgramProviderKeyType = std::tuple<std::string, std::string>;
} }

19
render/Renderer.cc → src/render/Renderer.cc
View File

@@ -1,12 +1,8 @@
#include <glbinding/gl/gl.h> #include "common.hh"
#include <glbinding/Binding.h>
#include <glbinding/callbacks.h>
#include <glbinding/Meta.h>
#include "Renderer.hh" #include "Renderer.hh"
#include "GlResource.hh" #include "GlResource.hh"
#include "game/GameState.hh" #include "game/GameState.hh"
#include "exceptions.hh"
#include "Overlay.hh" #include "Overlay.hh"
using namespace gl; using namespace gl;
@@ -17,6 +13,9 @@ namespace render {
GLException(GLenum err) : Exception(), err_(err) { GLException(GLenum err) : Exception(), err_(err) {
} }
GLException(GLenum err, glbinding::FunctionCall const& fc) : Exception(fc.toString()), err_(err) {
}
GLenum getErr() const {return err_;} GLenum getErr() const {return err_;}
std::string errToString() const { std::string errToString() const {
@@ -40,7 +39,7 @@ namespace render {
} }
std::string toString() const override { std::string toString() const override {
return "GLException: " + errToString() + "(" + std::to_string(static_cast<int>(err_)) + ")"; return "GLException: " + errToString() + "(" + std::to_string(static_cast<int>(err_)) + "):" + msg_;
} }
private: private:
@@ -53,12 +52,12 @@ namespace render {
GLenum error = glGetError(); GLenum error = glGetError();
glbinding::setCallbackMask(glbinding::CallbackMask::After); glbinding::setCallbackMask(glbinding::CallbackMask::After);
if (error != GL_NO_ERROR) if (error != GL_NO_ERROR)
throw GLException(error); throw GLException(error, fc);
} }
Renderer::Renderer() Renderer::Renderer(bool fullscreen)
: sdlInit_(), ttfInit_(), window_(), context_() : sdlInit_(), ttfInit_(), window_(), context_()
{ {
// Initialize OpenGL // Initialize OpenGL
@@ -73,8 +72,8 @@ namespace render {
window_.reset(SDL_CreateWindow("WC3 RE", window_.reset(SDL_CreateWindow("WC3 RE",
SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
0, 0, 640, 400,
SDL_WINDOW_FULLSCREEN_DESKTOP | SDL_WINDOW_OPENGL)); (fullscreen?SDL_WINDOW_FULLSCREEN_DESKTOP:0) | SDL_WINDOW_OPENGL));
if (!window_) if (!window_)
throw SDLException{}; throw SDLException{};

4
render/Renderer.hh → src/render/Renderer.hh
View File

@@ -1,8 +1,6 @@
#ifndef WC3RE_RENDER_RENDERER_HH__ #ifndef WC3RE_RENDER_RENDERER_HH__
#define WC3RE_RENDER_RENDERER_HH__ #define WC3RE_RENDER_RENDERER_HH__
#include <memory>
#include "sdlutil.hh" #include "sdlutil.hh"
#include "AlResource.hh" #include "AlResource.hh"
@@ -15,7 +13,7 @@ namespace render {
class Renderer { class Renderer {
public: public:
Renderer(); Renderer(bool fullscreen = true);
~Renderer(); ~Renderer();
void run(); void run();

4
render/VBOManager.cc → src/render/VBOManager.cc
View File

@@ -1,6 +1,4 @@
#include <glbinding/gl/gl.h> #include "common.hh"
#include <cassert>
#include <mutex>
#include "VBOManager.hh" #include "VBOManager.hh"

11
render/VBOManager.hh → src/render/VBOManager.hh
View File

@@ -1,15 +1,6 @@
#ifndef WC3RE_RENDER_VBOMANAGER_HH__ #ifndef WC3RE_RENDER_VBOMANAGER_HH__
#define WC3RE_RENDER_VBOMANAGER_HH__ #define WC3RE_RENDER_VBOMANAGER_HH__
#include <map>
#include <list>
#include <memory>
#include <cassert>
#include <vector>
#include <glbinding/gl/types.h>
#include <glbinding/gl/enum.h>
#include "Singleton.hh" #include "Singleton.hh"
namespace render { namespace render {
@@ -67,7 +58,7 @@ namespace render {
return _vbo->getID(); return _vbo->getID();
} }
explicit operator bool() const noexcept { explicit operator bool() const NO_EXCEPT {
return (_vbo != nullptr); return (_vbo != nullptr);
} }

31
render/renderutil.cc → src/render/renderutil.cc
View File

@@ -1,8 +1,6 @@
#include <glbinding/gl/gl.h> #include "common.hh"
#include <SDL2/SDL.h>
#include "renderutil.hh" #include "renderutil.hh"
#include "exceptions.hh"
using namespace gl; using namespace gl;
@@ -26,7 +24,8 @@ namespace render {
if ((maxTexSize < 0) || (maxArrTexLayers < 0)) if ((maxTexSize < 0) || (maxArrTexLayers < 0))
throw Exception{"GL returned negative values for max tex. dimensions"}; throw Exception{"GL returned negative values for max tex. dimensions"};
return std::make_tuple<unsigned, unsigned>(maxTexSize, maxArrTexLayers); return std::make_tuple<unsigned, unsigned>(static_cast<unsigned>(maxTexSize),
static_cast<unsigned>(maxArrTexLayers));
} }
void useProgram(GLuint program) void useProgram(GLuint program)
@@ -39,6 +38,20 @@ namespace render {
} }
} }
bool extensionSupported(std::string const& extname)
{
static std::unordered_map<std::string, bool> extensions;
auto it = extensions.find(extname);
if (it != extensions.end())
return it->second;
bool support = SDL_GL_ExtensionSupported(extname.c_str());
extensions.emplace(extname, support);
return support;
}
TextureResource create2DTexture(unsigned width, unsigned height, bool alpha, unsigned levels) TextureResource create2DTexture(unsigned width, unsigned height, bool alpha, unsigned levels)
{ {
TextureResource tex; TextureResource tex;
@@ -46,15 +59,17 @@ namespace render {
glBindTexture(GL_TEXTURE_2D, tex); glBindTexture(GL_TEXTURE_2D, tex);
unsigned logWidth = ilog2(width), logHeight = ilog2(height); unsigned logWidth = ilog2(width), logHeight = ilog2(height);
if (levels == 0) if (levels == 0)
levels = std::max(logWidth,logHeight)+1u; levels = std::max(logWidth,logHeight)+1u;
if(SDL_GL_ExtensionSupported("GL_ARB_texture_storage"))
if(extensionSupported("GL_ARB_texture_storage"))
glTexStorage2D(GL_TEXTURE_2D, levels, alpha?GL_RGBA8:GL_RGB8, width, height); glTexStorage2D(GL_TEXTURE_2D, levels, alpha?GL_RGBA8:GL_RGB8, width, height);
else { else {
std::printf("Warning: extension GL_ARB_texture_storage not supported!\n"); std::printf("Warning: extension GL_ARB_texture_storage not supported!\n");
for (unsigned i = 0u; i < levels; ++i) { for (unsigned i = 0u; i < levels; ++i) {
glTexImage2D(GL_TEXTURE_2D, i, static_cast<const int>(alpha?GL_RGBA8:GL_RGB8), width, height, 0, glTexImage2D(GL_TEXTURE_2D, i, static_cast<const int>(alpha?GL_RGBA8:GL_RGB8), width, height, 0,
alpha?GL_RGBA8:GL_RGB8, GL_UNSIGNED_BYTE, NULL); alpha?GL_RGBA:GL_RGB, GL_UNSIGNED_BYTE, NULL);
width = std::max(1u, (width / 2u)); width = std::max(1u, (width / 2u));
height = std::max(1u, (height / 2u)); height = std::max(1u, (height / 2u));
} }
@@ -72,9 +87,11 @@ namespace render {
glBindTexture(GL_TEXTURE_2D_ARRAY, tex); glBindTexture(GL_TEXTURE_2D_ARRAY, tex);
unsigned logWidth = ilog2(width), logHeight = ilog2(height); unsigned logWidth = ilog2(width), logHeight = ilog2(height);
if (levels == 0) if (levels == 0)
levels = std::max(logWidth,logHeight)+1u; levels = std::max(logWidth,logHeight)+1u;
if(SDL_GL_ExtensionSupported("GL_ARB_texture_storage"))
if(extensionSupported("GL_ARB_texture_storage"))
glTexStorage3D(GL_TEXTURE_2D_ARRAY, levels, alpha?GL_RGBA8:GL_RGB8, width, height, count); glTexStorage3D(GL_TEXTURE_2D_ARRAY, levels, alpha?GL_RGBA8:GL_RGB8, width, height, count);
else { else {
std::printf("Warning: extension GL_ARB_texture_storage not supported!\n"); std::printf("Warning: extension GL_ARB_texture_storage not supported!\n");

2
render/renderutil.hh → src/render/renderutil.hh
View File

@@ -12,6 +12,8 @@ namespace render {
// call glUseProgram if program != current program // call glUseProgram if program != current program
void useProgram(gl::GLuint program); void useProgram(gl::GLuint program);
bool extensionSupported(std::string const& extname);
TextureResource create2DTexture(unsigned width, unsigned height, bool alpha, unsigned levels = 0); TextureResource create2DTexture(unsigned width, unsigned height, bool alpha, unsigned levels = 0);
TextureResource create2DArrayTexture(unsigned width, unsigned height, unsigned count, TextureResource create2DArrayTexture(unsigned width, unsigned height, unsigned count,
bool alpha, unsigned levels = 0); bool alpha, unsigned levels = 0);

8
render/sdlutil.hh → src/render/sdlutil.hh
View File

@@ -1,14 +1,6 @@
#ifndef WC3RE_RENDER_SDLUTIL_HH__ #ifndef WC3RE_RENDER_SDLUTIL_HH__
#define WC3RE_RENDER_SDLUTIL_HH__ #define WC3RE_RENDER_SDLUTIL_HH__
#include <memory>
#include <cstdint>
#include <SDL2/SDL.h>
#include <SDL2/SDL_ttf.h>
#include "exceptions.hh"
namespace render { namespace render {
class SDLException : public Exception { class SDLException : public Exception {

6
shapdecode.cc → src/shapdecode.cc
View File

@@ -1,9 +1,5 @@
#include <cstdio>
#include <cstring>
#include <unistd.h>
#include "common.hh" #include "common.hh"
#include "util.hh" #include "util.hh"
#include "ShapDecoder.hh" #include "ShapDecoder.hh"
#include "IffFile.hh" #include "IffFile.hh"

14
treexplore.cc → src/treexplore.cc
View File

@@ -1,17 +1,5 @@
#include <cstdio>
#include <cstring>
#include <cerrno>
#include <cstdint>
#include <vector>
#include <limits>
#ifndef WIN32
#include <unistd.h>
#else
#include "getopt.h"
#endif
#include "common.hh" #include "common.hh"
#include "util.hh" #include "util.hh"
#include "TreFile.hh" #include "TreFile.hh"
#include "IffFile.hh" #include "IffFile.hh"

20
util.cc → src/util.cc
View File

@@ -1,16 +1,5 @@
#include <stdexcept>
#include <cstring>
#include <sys/types.h>
#include <sys/stat.h>
#ifndef WIN32
#include <sys/mman.h>
#include <unistd.h>
#else
#define fileno _fileno
#endif
#include "common.hh" #include "common.hh"
#include "util.hh" #include "util.hh"
#ifndef WIN32 #ifndef WIN32
@@ -76,7 +65,10 @@ MmapFile::MmapFile(std::string fileName)
LARGE_INTEGER size; LARGE_INTEGER size;
if (!GetFileSizeEx(file_hnd_, &size)) if (!GetFileSizeEx(file_hnd_, &size))
throw Win32Exception(GetLastError(), "GetFileSizeEx() failed"); throw Win32Exception(GetLastError(), "GetFileSizeEx() failed");
size_ = size.QuadPart;
if (size.QuadPart > std::numeric_limits<size_t>::max())
throw Exception("File size exceeds size_t");
size_ = static_cast<size_t>(size.QuadPart);
fm_hnd_ = CreateFileMapping(file_hnd_, NULL, PAGE_READONLY, 0, 0, NULL); fm_hnd_ = CreateFileMapping(file_hnd_, NULL, PAGE_READONLY, 0, 0, NULL);
if (fm_hnd_ == INVALID_HANDLE_VALUE) { if (fm_hnd_ == INVALID_HANDLE_VALUE) {
@@ -157,7 +149,7 @@ uint8_t const* MmapFile::data() const
MmapFile::operator bool() const MmapFile::operator bool() const
{ {
return base_; return (base_ != nullptr);
} }

17
util.hh → src/util.hh
View File

@@ -1,17 +1,16 @@
#ifndef WC3RE_UTIL_HH__ #ifndef WC3RE_UTIL_HH__
#define WC3RE_UTIL_HH__ #define WC3RE_UTIL_HH__
#include <cstdint>
#include <string>
#ifdef WIN32
#define NOMINMAX
#include <Windows.h>
#endif
#include "common.hh"
#include "Resource.hh" #include "Resource.hh"
struct FILEDeleter {
void operator()(FILE* file) const {
fclose(file);
}
};
using FILEUPtr = std::unique_ptr<FILE, FILEDeleter>;
class MmapFile : public Resource { class MmapFile : public Resource {
public: public:
MmapFile(std::string fileName); MmapFile(std::string fileName);

69
treexplore.vcxproj
View File

@@ -10,6 +10,34 @@
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClCompile Include="src\common.cc">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">common.hh</PrecompiledHeaderFile>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">common.hh</PrecompiledHeaderFile>
</ClCompile>
<ClCompile Include="src\decompress.cc" />
<ClCompile Include="src\exceptions.cc" />
<ClCompile Include="src\IffFile.cc" />
<ClCompile Include="src\ResourceProvider.cc" />
<ClCompile Include="src\treexplore.cc" />
<ClCompile Include="src\TreFile.cc" />
<ClCompile Include="src\util.cc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\common.hh" />
<ClInclude Include="src\compiler.hh" />
<ClInclude Include="src\decompress.hh" />
<ClInclude Include="src\exceptions.hh" />
<ClInclude Include="src\IffFile.hh" />
<ClInclude Include="src\platform.hh" />
<ClInclude Include="src\Resource.hh" />
<ClInclude Include="src\ResourceProvider.hh" />
<ClInclude Include="src\Singleton.hh" />
<ClInclude Include="src\TreFile.hh" />
<ClInclude Include="src\util.hh" />
</ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{5AB0D2CB-6E7B-400C-86AE-2D61AA70B3EC}</ProjectGuid> <ProjectGuid>{5AB0D2CB-6E7B-400C-86AE-2D61AA70B3EC}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
@@ -41,67 +69,54 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IntDir>$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<IntDir>$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>D:\devel\wc3re\libs\wingetopt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>env\SDL2_ttf-2.0.12\include;env\SDL2-2.0.3\include;libs\wingetopt;env\glm;env\glbinding\include;env\openal-soft-1.16.0-bin\include</AdditionalIncludeDirectories>
<PrecompiledHeaderFile>common.hh</PrecompiledHeaderFile>
<DisableSpecificWarnings>4101;4251</DisableSpecificWarnings>
<AdditionalOptions>/Zm190</AdditionalOptions>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>D:\devel\wc3re\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;wingetopt.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;wingetopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGSNDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGSNDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>D:\devel\wc3re\libs\wingetopt;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>env\SDL2_ttf-2.0.12\include;env\SDL2-2.0.3\include;libs\wingetopt;env\glm;env\glbinding\include;env\openal-soft-1.16.0-bin\include</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4101;4251</DisableSpecificWarnings>
<PrecompiledHeaderFile>common.hh</PrecompiledHeaderFile>
<AdditionalOptions>/Zm190</AdditionalOptions>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>D:\devel\wc3re\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;wingetopt.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;wingetopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="common.hh" />
<ClInclude Include="compiler.hh" />
<ClInclude Include="decompress.hh" />
<ClInclude Include="exceptions.hh" />
<ClInclude Include="IffFile.hh" />
<ClInclude Include="ResourceProvider.hh" />
<ClInclude Include="TreFile.hh" />
<ClInclude Include="util.hh" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="decompress.cc" />
<ClCompile Include="exceptions.cc" />
<ClCompile Include="IffFile.cc" />
<ClCompile Include="ResourceProvider.cc" />
<ClCompile Include="treexplore.cc" />
<ClCompile Include="TreFile.cc" />
<ClCompile Include="util.cc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

74
treexplore.vcxproj.filters Normal file
View File

@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{aab1f74c-b199-4808-94b3-355ea8c10661}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{a477e5a5-8ced-430d-a7b4-f3ed476e4e8b}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\common.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\decompress.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\exceptions.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\IffFile.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\ResourceProvider.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\treexplore.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\TreFile.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\util.cc">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\common.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\compiler.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\decompress.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\exceptions.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\IffFile.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\platform.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Resource.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\ResourceProvider.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Singleton.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\TreFile.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\util.hh">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

36
wc3re.sln
View File

@@ -4,9 +4,29 @@ Microsoft Visual Studio Solution File, Format Version 12.00
VisualStudioVersion = 12.0.31101.0 VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "treexplore", "treexplore.vcxproj", "{5AB0D2CB-6E7B-400C-86AE-2D61AA70B3EC}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "treexplore", "treexplore.vcxproj", "{5AB0D2CB-6E7B-400C-86AE-2D61AA70B3EC}"
ProjectSection(ProjectDependencies) = postProject
{50D0969D-054D-4726-A85B-3ED2FBCCC43E} = {50D0969D-054D-4726-A85B-3ED2FBCCC43E}
EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wingetopt", "libs\wingetopt\wingetopt.vcxproj", "{50D0969D-054D-4726-A85B-3ED2FBCCC43E}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wingetopt", "libs\wingetopt\wingetopt.vcxproj", "{50D0969D-054D-4726-A85B-3ED2FBCCC43E}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iffexplore", "iffexplore.vcxproj", "{23DC33B8-9A83-49C4-A2F4-0EC407CCD7E8}"
ProjectSection(ProjectDependencies) = postProject
{50D0969D-054D-4726-A85B-3ED2FBCCC43E} = {50D0969D-054D-4726-A85B-3ED2FBCCC43E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shapdecode", "shapdecode.vcxproj", "{5C417180-437D-4B93-92F2-1E6E6438573A}"
ProjectSection(ProjectDependencies) = postProject
{50D0969D-054D-4726-A85B-3ED2FBCCC43E} = {50D0969D-054D-4726-A85B-3ED2FBCCC43E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mvedecode", "mvedecode.vcxproj", "{94524082-F925-415B-9ABC-D9C68CDCB01F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "objdecode", "objdecode.vcxproj", "{E3B62A51-0886-47B3-95CA-906AC56CC1A8}"
ProjectSection(ProjectDependencies) = postProject
{50D0969D-054D-4726-A85B-3ED2FBCCC43E} = {50D0969D-054D-4726-A85B-3ED2FBCCC43E}
EndProjectSection
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
@@ -21,6 +41,22 @@ Global
{50D0969D-054D-4726-A85B-3ED2FBCCC43E}.Debug|Win32.Build.0 = Debug|Win32 {50D0969D-054D-4726-A85B-3ED2FBCCC43E}.Debug|Win32.Build.0 = Debug|Win32
{50D0969D-054D-4726-A85B-3ED2FBCCC43E}.Release|Win32.ActiveCfg = Release|Win32 {50D0969D-054D-4726-A85B-3ED2FBCCC43E}.Release|Win32.ActiveCfg = Release|Win32
{50D0969D-054D-4726-A85B-3ED2FBCCC43E}.Release|Win32.Build.0 = Release|Win32 {50D0969D-054D-4726-A85B-3ED2FBCCC43E}.Release|Win32.Build.0 = Release|Win32
{23DC33B8-9A83-49C4-A2F4-0EC407CCD7E8}.Debug|Win32.ActiveCfg = Debug|Win32
{23DC33B8-9A83-49C4-A2F4-0EC407CCD7E8}.Debug|Win32.Build.0 = Debug|Win32
{23DC33B8-9A83-49C4-A2F4-0EC407CCD7E8}.Release|Win32.ActiveCfg = Release|Win32
{23DC33B8-9A83-49C4-A2F4-0EC407CCD7E8}.Release|Win32.Build.0 = Release|Win32
{5C417180-437D-4B93-92F2-1E6E6438573A}.Debug|Win32.ActiveCfg = Debug|Win32
{5C417180-437D-4B93-92F2-1E6E6438573A}.Debug|Win32.Build.0 = Debug|Win32
{5C417180-437D-4B93-92F2-1E6E6438573A}.Release|Win32.ActiveCfg = Release|Win32
{5C417180-437D-4B93-92F2-1E6E6438573A}.Release|Win32.Build.0 = Release|Win32
{94524082-F925-415B-9ABC-D9C68CDCB01F}.Debug|Win32.ActiveCfg = Debug|Win32
{94524082-F925-415B-9ABC-D9C68CDCB01F}.Debug|Win32.Build.0 = Debug|Win32
{94524082-F925-415B-9ABC-D9C68CDCB01F}.Release|Win32.ActiveCfg = Release|Win32
{94524082-F925-415B-9ABC-D9C68CDCB01F}.Release|Win32.Build.0 = Release|Win32
{E3B62A51-0886-47B3-95CA-906AC56CC1A8}.Debug|Win32.ActiveCfg = Debug|Win32
{E3B62A51-0886-47B3-95CA-906AC56CC1A8}.Debug|Win32.Build.0 = Debug|Win32
{E3B62A51-0886-47B3-95CA-906AC56CC1A8}.Release|Win32.ActiveCfg = Release|Win32
{E3B62A51-0886-47B3-95CA-906AC56CC1A8}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE