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

Merge branch 'win32'

Browse Source
This commit is contained in:
Matthias Blankertz
2015-10-08 11:05:10 +02:00
parent 818c0821fe 86ba46667d
commit a9b339019b
78 changed files with 2426 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -1,8 +1,12 @@
data/ data/
objs/ objs/
tmp/ tmp/
Debug/
Release/
*~ *~
iffexplore iffexplore
font2png font2png
pntr2png pntr2png
treexplore treexplore
*.vcxproj.user
*.gch

92
LICENSES Normal file
View File

@@ -0,0 +1,92 @@
Uses wingetopt on Windows platforms:
Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Sponsored in part by the Defense Advanced Research Projects
Agency (DARPA) and Air Force Research Laboratory, Air Force
Materiel Command, USAF, under agreement number F39502-99-1-0512.
Copyright (c) 2000 The NetBSD Foundation, Inc.
All rights reserved.
This code is derived from software contributed to The NetBSD Foundation
by Dieter Baron and Thomas Klausner.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
Uses components of boost:
Boost Software License - Version 1.0 - August 17th, 2003
Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:
The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
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
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>

560
libs/wingetopt/getopt.c Normal file
View File

@@ -0,0 +1,560 @@
/* $OpenBSD: getopt_long.c,v 1.23 2007/10/31 12:34:57 chl Exp $ */
/* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $ */
/*
* Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Sponsored in part by the Defense Advanced Research Projects
* Agency (DARPA) and Air Force Research Laboratory, Air Force
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
*/
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Dieter Baron and Thomas Klausner.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
#include "getopt.h"
#define REPLACE_GETOPT /* use this getopt as the system getopt(3) */
#ifdef REPLACE_GETOPT
int opterr = 1; /* if error message should be printed */
int optind = 1; /* index into parent argv vector */
int optopt = '?'; /* character checked for validity */
#undef optreset /* see getopt.h */
#define optreset __mingw_optreset
int optreset; /* reset getopt */
char *optarg; /* argument associated with option */
#endif
#define PRINT_ERROR ((opterr) && (*options != ':'))
#define FLAG_PERMUTE 0x01 /* permute non-options to the end of argv */
#define FLAG_ALLARGS 0x02 /* treat non-options as args to option "-1" */
#define FLAG_LONGONLY 0x04 /* operate as getopt_long_only */
/* return values */
#define BADCH (int)'?'
#define BADARG ((*options == ':') ? (int)':' : (int)'?')
#define INORDER (int)1
#ifndef __CYGWIN__
#define __progname __argv[0]
#else
extern char __declspec(dllimport) *__progname;
#endif
#ifdef __CYGWIN__
static char EMSG[] = "";
#else
#define EMSG ""
#endif
static int getopt_internal(int, char * const *, const char *,
const struct option *, int *, int);
static int parse_long_options(char * const *, const char *,
const struct option *, int *, int);
static int gcd(int, int);
static void permute_args(int, int, int, char * const *);
static char *place = EMSG; /* option letter processing */
/* XXX: set optreset to 1 rather than these two */
static int nonopt_start = -1; /* first non option argument (for permute) */
static int nonopt_end = -1; /* first option after non options (for permute) */
/* Error messages */
static const char recargchar[] = "option requires an argument -- %c";
static const char recargstring[] = "option requires an argument -- %s";
static const char ambig[] = "ambiguous option -- %.*s";
static const char noarg[] = "option doesn't take an argument -- %.*s";
static const char illoptchar[] = "unknown option -- %c";
static const char illoptstring[] = "unknown option -- %s";
static void
_vwarnx(const char *fmt,va_list ap)
{
(void)fprintf(stderr,"%s: ",__progname);
if (fmt != NULL)
(void)vfprintf(stderr,fmt,ap);
(void)fprintf(stderr,"\n");
}
static void
warnx(const char *fmt,...)
{
va_list ap;
va_start(ap,fmt);
_vwarnx(fmt,ap);
va_end(ap);
}
/*
* Compute the greatest common divisor of a and b.
*/
static int
gcd(int a, int b)
{
int c;
c = a % b;
while (c != 0) {
a = b;
b = c;
c = a % b;
}
return (b);
}
/*
* Exchange the block from nonopt_start to nonopt_end with the block
* from nonopt_end to opt_end (keeping the same order of arguments
* in each block).
*/
static void
permute_args(int panonopt_start, int panonopt_end, int opt_end,
char * const *nargv)
{
int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
char *swap;
/*
* compute lengths of blocks and number and size of cycles
*/
nnonopts = panonopt_end - panonopt_start;
nopts = opt_end - panonopt_end;
ncycle = gcd(nnonopts, nopts);
cyclelen = (opt_end - panonopt_start) / ncycle;
for (i = 0; i < ncycle; i++) {
cstart = panonopt_end+i;
pos = cstart;
for (j = 0; j < cyclelen; j++) {
if (pos >= panonopt_end)
pos -= nnonopts;
else
pos += nopts;
swap = nargv[pos];
/* LINTED const cast */
((char **) nargv)[pos] = nargv[cstart];
/* LINTED const cast */
((char **)nargv)[cstart] = swap;
}
}
}
/*
* parse_long_options --
* Parse long options in argc/argv argument vector.
* Returns -1 if short_too is set and the option does not match long_options.
*/
static int
parse_long_options(char * const *nargv, const char *options,
const struct option *long_options, int *idx, int short_too)
{
char *current_argv, *has_equal;
size_t current_argv_len;
int i, ambiguous, match;
#define IDENTICAL_INTERPRETATION(_x, _y) \
(long_options[(_x)].has_arg == long_options[(_y)].has_arg && \
long_options[(_x)].flag == long_options[(_y)].flag && \
long_options[(_x)].val == long_options[(_y)].val)
current_argv = place;
match = -1;
ambiguous = 0;
optind++;
if ((has_equal = strchr(current_argv, '=')) != NULL) {
/* argument found (--option=arg) */
current_argv_len = has_equal - current_argv;
has_equal++;
} else
current_argv_len = strlen(current_argv);
for (i = 0; long_options[i].name; i++) {
/* find matching long option */
if (strncmp(current_argv, long_options[i].name,
current_argv_len))
continue;
if (strlen(long_options[i].name) == current_argv_len) {
/* exact match */
match = i;
ambiguous = 0;
break;
}
/*
* If this is a known short option, don't allow
* a partial match of a single character.
*/
if (short_too && current_argv_len == 1)
continue;
if (match == -1) /* partial match */
match = i;
else if (!IDENTICAL_INTERPRETATION(i, match))
ambiguous = 1;
}
if (ambiguous) {
/* ambiguous abbreviation */
if (PRINT_ERROR)
warnx(ambig, (int)current_argv_len,
current_argv);
optopt = 0;
return (BADCH);
}
if (match != -1) { /* option found */
if (long_options[match].has_arg == no_argument
&& has_equal) {
if (PRINT_ERROR)
warnx(noarg, (int)current_argv_len,
current_argv);
/*
* XXX: GNU sets optopt to val regardless of flag
*/
if (long_options[match].flag == NULL)
optopt = long_options[match].val;
else
optopt = 0;
return (BADARG);
}
if (long_options[match].has_arg == required_argument ||
long_options[match].has_arg == optional_argument) {
if (has_equal)
optarg = has_equal;
else if (long_options[match].has_arg ==
required_argument) {
/*
* optional argument doesn't use next nargv
*/
optarg = nargv[optind++];
}
}
if ((long_options[match].has_arg == required_argument)
&& (optarg == NULL)) {
/*
* Missing argument; leading ':' indicates no error
* should be generated.
*/
if (PRINT_ERROR)
warnx(recargstring,
current_argv);
/*
* XXX: GNU sets optopt to val regardless of flag
*/
if (long_options[match].flag == NULL)
optopt = long_options[match].val;
else
optopt = 0;
--optind;
return (BADARG);
}
} else { /* unknown option */
if (short_too) {
--optind;
return (-1);
}
if (PRINT_ERROR)
warnx(illoptstring, current_argv);
optopt = 0;
return (BADCH);
}
if (idx)
*idx = match;
if (long_options[match].flag) {
*long_options[match].flag = long_options[match].val;
return (0);
} else
return (long_options[match].val);
#undef IDENTICAL_INTERPRETATION
}
/*
* getopt_internal --
* Parse argc/argv argument vector. Called by user level routines.
*/
static int
getopt_internal(int nargc, char * const *nargv, const char *options,
const struct option *long_options, int *idx, int flags)
{
char *oli; /* option letter list index */
int optchar, short_too;
static int posixly_correct = -1;
if (options == NULL)
return (-1);
/*
* XXX Some GNU programs (like cvs) set optind to 0 instead of
* XXX using optreset. Work around this braindamage.
*/
if (optind == 0)
optind = optreset = 1;
/*
* Disable GNU extensions if POSIXLY_CORRECT is set or options
* string begins with a '+'.
*
* CV, 2009-12-14: Check POSIXLY_CORRECT anew if optind == 0 or
* optreset != 0 for GNU compatibility.
*/
if (posixly_correct == -1 || optreset != 0) {
size_t foundlen;
getenv_s(&foundlen, NULL, 0, "POSIXLY_CORRECT");
posixly_correct = (foundlen != 0);
}
if (*options == '-')
flags |= FLAG_ALLARGS;
else if (posixly_correct || *options == '+')
flags &= ~FLAG_PERMUTE;
if (*options == '+' || *options == '-')
options++;
optarg = NULL;
if (optreset)
nonopt_start = nonopt_end = -1;
start:
if (optreset || !*place) { /* update scanning pointer */
optreset = 0;
if (optind >= nargc) { /* end of argument vector */
place = EMSG;
if (nonopt_end != -1) {
/* do permutation, if we have to */
permute_args(nonopt_start, nonopt_end,
optind, nargv);
optind -= nonopt_end - nonopt_start;
}
else if (nonopt_start != -1) {
/*
* If we skipped non-options, set optind
* to the first of them.
*/
optind = nonopt_start;
}
nonopt_start = nonopt_end = -1;
return (-1);
}
if (*(place = nargv[optind]) != '-' ||
(place[1] == '\0' && strchr(options, '-') == NULL)) {
place = EMSG; /* found non-option */
if (flags & FLAG_ALLARGS) {
/*
* GNU extension:
* return non-option as argument to option 1
*/
optarg = nargv[optind++];
return (INORDER);
}
if (!(flags & FLAG_PERMUTE)) {
/*
* If no permutation wanted, stop parsing
* at first non-option.
*/
return (-1);
}
/* do permutation */
if (nonopt_start == -1)
nonopt_start = optind;
else if (nonopt_end != -1) {
permute_args(nonopt_start, nonopt_end,
optind, nargv);
nonopt_start = optind -
(nonopt_end - nonopt_start);
nonopt_end = -1;
}
optind++;
/* process next argument */
goto start;
}
if (nonopt_start != -1 && nonopt_end == -1)
nonopt_end = optind;
/*
* If we have "-" do nothing, if "--" we are done.
*/
if (place[1] != '\0' && *++place == '-' && place[1] == '\0') {
optind++;
place = EMSG;
/*
* We found an option (--), so if we skipped
* non-options, we have to permute.
*/
if (nonopt_end != -1) {
permute_args(nonopt_start, nonopt_end,
optind, nargv);
optind -= nonopt_end - nonopt_start;
}
nonopt_start = nonopt_end = -1;
return (-1);
}
}
/*
* Check long options if:
* 1) we were passed some
* 2) the arg is not just "-"
* 3) either the arg starts with -- we are getopt_long_only()
*/
if (long_options != NULL && place != nargv[optind] &&
(*place == '-' || (flags & FLAG_LONGONLY))) {
short_too = 0;
if (*place == '-')
place++; /* --foo long option */
else if (*place != ':' && strchr(options, *place) != NULL)
short_too = 1; /* could be short option too */
optchar = parse_long_options(nargv, options, long_options,
idx, short_too);
if (optchar != -1) {
place = EMSG;
return (optchar);
}
}
if ((optchar = (int)*place++) == (int)':' ||
(optchar == (int)'-' && *place != '\0') ||
(oli = strchr(options, optchar)) == NULL) {
/*
* If the user specified "-" and '-' isn't listed in
* options, return -1 (non-option) as per POSIX.
* Otherwise, it is an unknown option character (or ':').
*/
if (optchar == (int)'-' && *place == '\0')
return (-1);
if (!*place)
++optind;
if (PRINT_ERROR)
warnx(illoptchar, optchar);
optopt = optchar;
return (BADCH);
}
if (long_options != NULL && optchar == 'W' && oli[1] == ';') {
/* -W long-option */
if (*place) /* no space */
/* NOTHING */;
else if (++optind >= nargc) { /* no arg */
place = EMSG;
if (PRINT_ERROR)
warnx(recargchar, optchar);
optopt = optchar;
return (BADARG);
} else /* white space */
place = nargv[optind];
optchar = parse_long_options(nargv, options, long_options,
idx, 0);
place = EMSG;
return (optchar);
}
if (*++oli != ':') { /* doesn't take argument */
if (!*place)
++optind;
} else { /* takes (optional) argument */
optarg = NULL;
if (*place) /* no white space */
optarg = place;
else if (oli[1] != ':') { /* arg not optional */
if (++optind >= nargc) { /* no arg */
place = EMSG;
if (PRINT_ERROR)
warnx(recargchar, optchar);
optopt = optchar;
return (BADARG);
} else
optarg = nargv[optind];
}
place = EMSG;
++optind;
}
/* dump back option letter */
return (optchar);
}
#ifdef REPLACE_GETOPT
/*
* getopt --
* Parse argc/argv argument vector.
*
* [eventually this will replace the BSD getopt]
*/
int
getopt(int nargc, char * const *nargv, const char *options)
{
/*
* We don't pass FLAG_PERMUTE to getopt_internal() since
* the BSD getopt(3) (unlike GNU) has never done this.
*
* Furthermore, since many privileged programs call getopt()
* before dropping privileges it makes sense to keep things
* as simple (and bug-free) as possible.
*/
return (getopt_internal(nargc, nargv, options, NULL, NULL, 0));
}
#endif /* REPLACE_GETOPT */
/*
* getopt_long --
* Parse argc/argv argument vector.
*/
int
getopt_long(int nargc, char * const *nargv, const char *options,
const struct option *long_options, int *idx)
{
return (getopt_internal(nargc, nargv, options, long_options, idx,
FLAG_PERMUTE));
}
/*
* getopt_long_only --
* Parse argc/argv argument vector.
*/
int
getopt_long_only(int nargc, char * const *nargv, const char *options,
const struct option *long_options, int *idx)
{
return (getopt_internal(nargc, nargv, options, long_options, idx,
FLAG_PERMUTE|FLAG_LONGONLY));
}

95
libs/wingetopt/getopt.h Normal file
View File

@@ -0,0 +1,95 @@
#ifndef __GETOPT_H__
/**
* DISCLAIMER
* This file has no copyright assigned and is placed in the Public Domain.
* This file is a part of the w64 mingw-runtime package.
*
* The w64 mingw-runtime package and its code is distributed in the hope that it
* will be useful but WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESSED OR
* IMPLIED ARE HEREBY DISCLAIMED. This includes but is not limited to
* warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
#define __GETOPT_H__
/* All the headers include this file. */
#include <crtdefs.h>
#ifdef __cplusplus
extern "C" {
#endif
extern int optind; /* index of first non-option in argv */
extern int optopt; /* single option character, as parsed */
extern int opterr; /* flag to enable built-in diagnostics... */
/* (user may set to zero, to suppress) */
extern char *optarg; /* pointer to argument of current option */
extern int getopt(int nargc, char * const *nargv, const char *options);
#ifdef _BSD_SOURCE
/*
* BSD adds the non-standard `optreset' feature, for reinitialisation
* of `getopt' parsing. We support this feature, for applications which
* proclaim their BSD heritage, before including this header; however,
* to maintain portability, developers are advised to avoid it.
*/
# define optreset __mingw_optreset
extern int optreset;
#endif
#ifdef __cplusplus
}
#endif
/*
* POSIX requires the `getopt' API to be specified in `unistd.h';
* thus, `unistd.h' includes this header. However, we do not want
* to expose the `getopt_long' or `getopt_long_only' APIs, when
* included in this manner. Thus, close the standard __GETOPT_H__
* declarations block, and open an additional __GETOPT_LONG_H__
* specific block, only when *not* __UNISTD_H_SOURCED__, in which
* to declare the extended API.
*/
#endif /* !defined(__GETOPT_H__) */
#if !defined(__UNISTD_H_SOURCED__) && !defined(__GETOPT_LONG_H__)
#define __GETOPT_LONG_H__
#ifdef __cplusplus
extern "C" {
#endif
struct option /* specification for a long form option... */
{
const char *name; /* option name, without leading hyphens */
int has_arg; /* does it take an argument? */
int *flag; /* where to save its status, or NULL */
int val; /* its associated status value */
};
enum /* permitted values for its `has_arg' field... */
{
no_argument = 0, /* option never takes an argument */
required_argument, /* option always requires an argument */
optional_argument /* option may take an argument */
};
extern int getopt_long(int nargc, char * const *nargv, const char *options,
const struct option *long_options, int *idx);
extern int getopt_long_only(int nargc, char * const *nargv, const char *options,
const struct option *long_options, int *idx);
/*
* Previous MinGW implementation had...
*/
#ifndef HAVE_DECL_GETOPT
/*
* ...for the long form API only; keep this for compatibility.
*/
# define HAVE_DECL_GETOPT 1
#endif
#ifdef __cplusplus
}
#endif
#endif /* !defined(__UNISTD_H_SOURCED__) && !defined(__GETOPT_LONG_H__) */

8
libs/wingetopt/stdafx.c Normal file
View File

@@ -0,0 +1,8 @@
// stdafx.cpp : source file that includes just the standard includes
// wingetopt.pch will be the pre-compiled header
// stdafx.obj will contain the pre-compiled type information
#include "stdafx.h"
// TODO: reference any additional headers you need in STDAFX.H
// and not in this file

17
libs/wingetopt/stdafx.h Normal file
View File

@@ -0,0 +1,17 @@
// stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently, but
// are changed infrequently
//
#pragma once
#include "targetver.h"
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#include <stdio.h>
#include <windows.h>

8
libs/wingetopt/targetver.h Normal file
View File

@@ -0,0 +1,8 @@
#pragma once
// Including SDKDDKVer.h defines the highest available Windows platform.
// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
#include <SDKDDKVer.h>

91
libs/wingetopt/wingetopt.vcxproj Normal file
View File

@@ -0,0 +1,91 @@
<?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>{50D0969D-054D-4726-A85B-3ED2FBCCC43E}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>wingetopt</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</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 />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</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;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<Text Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="getopt.h" />
<ClInclude Include="stdafx.h" />
<ClInclude Include="targetver.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="getopt.c" />
<ClCompile Include="stdafx.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</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>

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

@@ -1,11 +1,10 @@
#include <cstring> #include "common.hh"
#include "IffFile.hh" #include "IffFile.hh"
#include "util.hh" #include "util.hh"
#include "common.hh"
struct ChunkHeader { struct ChunkHeader {
char typeID[4]; unsigned char typeID[4];
uint32_t length; uint32_t length;
}; };
@@ -73,7 +72,7 @@ IffFile::parseObject(IffFile& parent, uint8_t const* base, size_t length,
static_cast<size_t>(header.length), static_cast<size_t>(header.length),
footprint)); footprint));
else else
return std::unique_ptr<Object>(new Object(parent, std::string(header.typeID, 4), return std::unique_ptr<Object>(new Object(parent, std::string(reinterpret_cast<char const*>(header.typeID), 4),
base+8, static_cast<size_t>(header.length), base+8, static_cast<size_t>(header.length),
footprint)); footprint));
} }
@@ -132,27 +131,27 @@ IffFile::Object::Object(IffFile& parent, std::string type, uint8_t const* base,
IffFile::Object::operator std::string() const IffFile::Object::operator std::string() const
{ {
// Check if BLOB is string // Check if BLOB is string
enum class State { STARTASCII, NULLS, ERROR }; enum class State { STARTASCII, NULLS, NOT_STRING };
State state = State::STARTASCII; State state = State::STARTASCII;
for (char const& c : *this) { for (char const& c : *this) {
switch(state) { switch(state) {
case State::STARTASCII: case State::STARTASCII:
if (isprint(c)) if (isprint(static_cast<unsigned char>(c)))
continue; continue;
if (c == '\0') if (c == '\0')
state = State::NULLS; state = State::NULLS;
else else
state = State::ERROR; state = State::NOT_STRING;
break; break;
case State::NULLS: case State::NULLS:
if (c != '\0') if (c != '\0')
state = State::ERROR; state = State::NOT_STRING;
break; break;
case State::ERROR: case State::NOT_STRING:
break; break;
} }
if (state == State::ERROR) if (state == State::NOT_STRING)
break; break;
} }

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 {

11
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) {
@@ -31,7 +24,7 @@ public:
} }
protected: protected:
std::atomic_uint ref_; std::atomic<unsigned int> ref_;
}; };
template<class Resource> template<class Resource>
@@ -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:

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

@@ -1,9 +1,5 @@
#include <cstdio>
#include <cstdint>
#include <cstring>
#include <limits>
#include "common.hh" #include "common.hh"
#include "util.hh" #include "util.hh"
#include "decompress.hh" #include "decompress.hh"
#include "TreFile.hh" #include "TreFile.hh"
@@ -243,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) {
} }
} }

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

@@ -1,13 +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 <experimental/optional>
#include "Resource.hh" #include "Resource.hh"
class TreFile : public RefCounted { class TreFile : public RefCounted {
@@ -44,9 +37,9 @@ public:
Object(Object && move) Object(Object && move)
: data_(std::move(move.data_)), base_(move.base_), length_(move.length_), : data_(std::move(move.data_)), base_(move.base_), length_(move.length_),
res_(std::move(move.res_)) { res_(std::move(move.res_)) {
move.data_ = std::experimental::nullopt; move.data_ = std::vector<uint8_t>();
move.base_ = nullptr; move.base_ = nullptr;
move.length_ = 0; move.length_ = 0;
} }
Object& operator=(Object const& copy) { Object& operator=(Object const& copy) {
@@ -62,7 +55,7 @@ public:
base_ = move.base_; base_ = move.base_;
length_ = move.length_; length_ = move.length_;
res_ = std::move(move.res_); res_ = std::move(move.res_);
move.data_ = std::experimental::nullopt; move.data_ = std::vector<uint8_t>();
move.base_ = nullptr; move.base_ = nullptr;
move.length_ = 0; move.length_ = 0;
return *this; return *this;
@@ -72,8 +65,8 @@ public:
} }
uint8_t const* data() const override { uint8_t const* data() const override {
if (data_) if (!data_.empty())
return data_->data(); return data_.data();
else else
return base_; return base_;
} }
@@ -83,7 +76,7 @@ public:
} }
operator bool() const override { operator bool() const override {
return data_ || base_; return data_.empty() || base_;
} }
size_t footprint() const override { size_t footprint() const override {
@@ -98,12 +91,12 @@ public:
} }
Object(std::vector<uint8_t> data) Object(std::vector<uint8_t> data)
: data_(std::move(data)), base_(nullptr), length_(data_->size()), res_() { : data_(std::move(data)), base_(nullptr), length_(data_.size()), res_() {
} }
private: private:
// Object either owns data (when decompressed) (res_ is null in this case)... // Object either owns data (when decompressed) (res_ is null in this case)...
std::experimental::optional<std::vector<uint8_t> > data_; std::vector<uint8_t> data_;
// .. or points to area in underlying data (when not compressed) // .. or points to area in underlying data (when not compressed)
uint8_t const* base_; uint8_t const* base_;
size_t length_; size_t length_;

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

8
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 */

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

@@ -1,9 +1,4 @@
#include <cstring> #include "common.hh"
#include <cerrno>
#include "exceptions.hh"
using namespace std::string_literals;
Exception::Exception(std::string msg) Exception::Exception(std::string msg)
: msg_(std::move(msg)) : msg_(std::move(msg))
@@ -56,3 +51,20 @@ std::string POSIXException::toString() const
{ {
return "POSIXException: " + msg_ + ": " + std::strerror(err_); return "POSIXException: " + msg_ + ": " + std::strerror(err_);
} }
#ifdef WIN32
Win32Exception::Win32Exception(DWORD err, std::string msg)
: Exception(std::move(msg)), err_(err)
{
}
DWORD Win32Exception::getErr() const
{
return err_;
}
std::string Win32Exception::toString() const
{
return "Win32Exception: " + msg_ + ": " + std::to_string(err_);
}
#endif

15
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 = "");
@@ -40,4 +38,17 @@ private:
int err_; int err_;
}; };
#ifdef WIN32
class Win32Exception : public Exception {
public:
Win32Exception(DWORD err, std::string msg = "");
DWORD getErr() const;
std::string toString() const override;
private:
DWORD err_;
};
#endif
#endif #endif

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;
@@ -16,6 +12,9 @@ namespace render {
public: public:
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_;}
@@ -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)
@@ -38,6 +37,20 @@ namespace render {
curProgram = program; curProgram = program;
} }
} }
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)
{ {
@@ -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

@@ -11,6 +11,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,

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"

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

@@ -1,13 +1,5 @@
#include <cstdio>
#include <cstring>
#include <cerrno>
#include <cstdint>
#include <vector>
#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"

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

@@ -1,13 +1,8 @@
#include <stdexcept>
#include <cstring>
#include <sys/mman.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include "common.hh" #include "common.hh"
#include "util.hh" #include "util.hh"
#ifndef WIN32
MmapFile::MmapFile(std::string fileName) MmapFile::MmapFile(std::string fileName)
: name_(std::move(fileName)), fd_(fopen(name_.c_str(), "rb")), size_(0), base_(nullptr) : name_(std::move(fileName)), fd_(fopen(name_.c_str(), "rb")), size_(0), base_(nullptr)
{ {
@@ -59,6 +54,77 @@ MmapFile& MmapFile::operator=(MmapFile && move)
return *this; return *this;
} }
#else
MmapFile::MmapFile(std::string fileName)
: name_(std::move(fileName)), file_hnd_(nullptr), fm_hnd_(nullptr), size_(0), base_(nullptr)
{
file_hnd_ = CreateFileA(name_.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (file_hnd_ == INVALID_HANDLE_VALUE)
throw Win32Exception(GetLastError(), "CreateFileA() failed");
LARGE_INTEGER size;
if (!GetFileSizeEx(file_hnd_, &size))
throw Win32Exception(GetLastError(), "GetFileSizeEx() failed");
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);
if (fm_hnd_ == INVALID_HANDLE_VALUE) {
CloseHandle(file_hnd_);
throw Win32Exception(GetLastError(), "CreateFileMapping() failed");
}
base_ = MapViewOfFile(fm_hnd_, FILE_MAP_READ, 0, 0, 0);
if (!base_) {
CloseHandle(fm_hnd_);
CloseHandle(file_hnd_);
throw Win32Exception(GetLastError(), "MapViewOfFile() failed");
}
}
MmapFile::MmapFile(MmapFile && move)
: name_(std::move(move.name_)), fm_hnd_(std::move(move.fm_hnd_)),
file_hnd_(std::move(move.file_hnd_)), size_(move.size_),
base_(move.base_)
{
move.base_ = nullptr;
move.fm_hnd_ = nullptr;
move.file_hnd_ = nullptr;
}
MmapFile::~MmapFile()
{
if (base_)
UnmapViewOfFile(base_);
if (fm_hnd_)
CloseHandle(fm_hnd_);
if (file_hnd_)
CloseHandle(file_hnd_);
}
MmapFile& MmapFile::operator=(MmapFile && move)
{
if (base_)
UnmapViewOfFile(base_);
if (fm_hnd_)
CloseHandle(fm_hnd_);
if (file_hnd_)
CloseHandle(file_hnd_);
fm_hnd_ = move.fm_hnd_;
file_hnd_ = move.file_hnd_;
base_ = move.base_;
move.base_ = nullptr;
move.fm_hnd_ = nullptr;
move.file_hnd_ = nullptr;
size_ = move.size_;
name_ = std::move(move.name_);
return *this;
}
#endif
std::string const& MmapFile::name() const std::string const& MmapFile::name() const
{ {
@@ -83,7 +149,7 @@ uint8_t const* MmapFile::data() const
MmapFile::operator bool() const MmapFile::operator bool() const
{ {
return base_; return (base_ != nullptr);
} }

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

@@ -1,12 +1,16 @@
#ifndef WC3RE_UTIL_HH__ #ifndef WC3RE_UTIL_HH__
#define WC3RE_UTIL_HH__ #define WC3RE_UTIL_HH__
#include <cstdint>
#include <string>
#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);
@@ -29,7 +33,11 @@ public:
} }
private: private:
std::string name_; std::string name_;
#ifndef WIN32
FILEUPtr fd_; FILEUPtr fd_;
#else
HANDLE file_hnd_, fm_hnd_;
#endif
size_t size_; size_t size_;
void *base_; void *base_;
}; };

123
treexplore.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>
<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">
<ProjectGuid>{5AB0D2CB-6E7B-400C-86AE-2D61AA70B3EC}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>treexplore</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;_CRT_SECURE_NO_WARNINGS_DEBUG;_CONSOLE;_LIB;%(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</AdditionalIncludeDirectories>
<PrecompiledHeaderFile>common.hh</PrecompiledHeaderFile>
<DisableSpecificWarnings>4101;4251</DisableSpecificWarnings>
<AdditionalOptions>/Zm190</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<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>
</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;_CRT_SECURE_NO_WARNINGSNDEBUG;_CONSOLE;_LIB;%(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</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4101;4251</DisableSpecificWarnings>
<PrecompiledHeaderFile>common.hh</PrecompiledHeaderFile>
<AdditionalOptions>/Zm190</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<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>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

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>

64
wc3re.sln Normal file
View File

@@ -0,0 +1,64 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
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
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wingetopt", "libs\wingetopt\wingetopt.vcxproj", "{50D0969D-054D-4726-A85B-3ED2FBCCC43E}"
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
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5AB0D2CB-6E7B-400C-86AE-2D61AA70B3EC}.Debug|Win32.ActiveCfg = Debug|Win32
{5AB0D2CB-6E7B-400C-86AE-2D61AA70B3EC}.Debug|Win32.Build.0 = Debug|Win32
{5AB0D2CB-6E7B-400C-86AE-2D61AA70B3EC}.Release|Win32.ActiveCfg = Release|Win32
{5AB0D2CB-6E7B-400C-86AE-2D61AA70B3EC}.Release|Win32.Build.0 = Release|Win32
{50D0969D-054D-4726-A85B-3ED2FBCCC43E}.Debug|Win32.ActiveCfg = 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.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
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal