mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-19 00:15:30 +00:00
added windows target, hash maps still not compilable for resource.cpp
This commit is contained in:
parent
5d4aeaf0e2
commit
2c1676db4a
@ -15,6 +15,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "actor.h"
|
||||
#include "engine.h"
|
||||
#include "costume.h"
|
||||
|
@ -15,6 +15,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#include <SDL.h>
|
||||
|
14
bits.h
14
bits.h
@ -19,9 +19,21 @@
|
||||
#define BITS_H
|
||||
|
||||
#include <SDL_byteorder.h>
|
||||
#include <stdint.h>
|
||||
#include "stdafx.h"
|
||||
#include "vector3d.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
typedef unsigned char byte;
|
||||
typedef unsigned char uint8_t;
|
||||
typedef unsigned short uint16_t;
|
||||
typedef signed short int16_t;
|
||||
typedef unsigned long uint32_t;
|
||||
typedef unsigned int uint_t;
|
||||
typedef signed char int8_t;
|
||||
typedef signed short int16_t;
|
||||
typedef signed long int32_t;
|
||||
#endif
|
||||
|
||||
inline uint8_t get_uint8(const char *data) {
|
||||
return *(reinterpret_cast<const unsigned char *>(data));
|
||||
}
|
||||
|
@ -15,6 +15,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "costume.h"
|
||||
#include "textsplit.h"
|
||||
#include "debug.h"
|
||||
|
@ -15,6 +15,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "debug.h"
|
||||
#include <cstdarg>
|
||||
#include <cstdio>
|
||||
|
@ -15,6 +15,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "engine.h"
|
||||
#include "scene.h"
|
||||
#include "lua.h"
|
||||
|
@ -18,9 +18,14 @@
|
||||
#ifndef HASH_MAP_HH
|
||||
#define HASH_MAP_HH
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#include <hash_map>
|
||||
#else
|
||||
#include <ext/hash_map>
|
||||
#endif
|
||||
#include <string>
|
||||
|
||||
#ifndef _MSC_VER
|
||||
namespace std {
|
||||
using namespace __gnu_cxx;
|
||||
};
|
||||
@ -32,5 +37,6 @@ namespace __gnu_cxx {
|
||||
}
|
||||
};
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@ -15,6 +15,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "keyframe.h"
|
||||
#include "debug.h"
|
||||
#include "bits.h"
|
||||
|
6
lab.cpp
6
lab.cpp
@ -15,6 +15,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "lab.h"
|
||||
#include "bits.h"
|
||||
#include <algorithm>
|
||||
@ -46,7 +47,9 @@ bool Lab::open(const char *filename) {
|
||||
|
||||
std::fseek(f_, 16, SEEK_SET);
|
||||
char binary_entry[16];
|
||||
#ifndef _MSC_VER
|
||||
file_map_.resize(num_entries);
|
||||
#endif
|
||||
for (int i = 0; i < num_entries; i++) {
|
||||
std::fread(binary_entry, 1, 16, f_);
|
||||
int fname_offset = get_LE_uint32(binary_entry);
|
||||
@ -57,6 +60,9 @@ bool Lab::open(const char *filename) {
|
||||
std::transform(fname.begin(), fname.end(), fname.begin(), tolower);
|
||||
|
||||
file_map_.insert(std::make_pair(fname, LabEntry(start, size)));
|
||||
#ifndef _MSC_VER
|
||||
file_map_.size();
|
||||
#endif
|
||||
}
|
||||
|
||||
delete [] string_table;
|
||||
|
1
lab.h
1
lab.h
@ -20,7 +20,6 @@
|
||||
|
||||
#include <string>
|
||||
#include <cstdio>
|
||||
#include <stdint.h>
|
||||
#include "hash_map.h"
|
||||
|
||||
class Block {
|
||||
|
@ -15,6 +15,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "localize.h"
|
||||
#include "registry.h"
|
||||
#include "debug.h"
|
||||
|
7
lua.cpp
7
lua.cpp
@ -15,6 +15,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "lua.h"
|
||||
#include "resource.h"
|
||||
#include "debug.h"
|
||||
@ -56,7 +57,11 @@ static inline Sound *check_sound(int num) {
|
||||
|
||||
static inline int check_int(int num) {
|
||||
double val = luaL_check_number(num);
|
||||
#ifndef _MSC_VER
|
||||
return int(round(val));
|
||||
#else
|
||||
return int(/*round*/(val));
|
||||
#endif
|
||||
}
|
||||
|
||||
static inline int check_control(int num) {
|
||||
@ -723,7 +728,7 @@ void GetControlState() {
|
||||
lua_pushnumber(0);
|
||||
else {
|
||||
Uint8 *keystate = SDL_GetKeyState(NULL);
|
||||
pushbool(keystate[num]);
|
||||
pushbool(keystate[num] != 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
207
lua.vcproj
Normal file
207
lua.vcproj
Normal file
@ -0,0 +1,207 @@
|
||||
<?xml version="1.0" encoding = "windows-1250"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.00"
|
||||
Name="lua"
|
||||
ProjectGUID="{5930DA38-F3BC-41AB-BC48-FC1AB8ED75B0}"
|
||||
Keyword="Win32Proj">
|
||||
<Platforms>
|
||||
<Platform
|
||||
Name="Win32"/>
|
||||
</Platforms>
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory="Debug_Lua"
|
||||
IntermediateDirectory="Debug_Lua"
|
||||
ConfigurationType="4"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="lua\include"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
|
||||
MinimalRebuild="TRUE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="TRUE"
|
||||
DebugInformationFormat="4"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)/lua.lib"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="Release_Lua"
|
||||
IntermediateDirectory="Release_Lua"
|
||||
ConfigurationType="4"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OmitFramePointers="TRUE"
|
||||
AdditionalIncludeDirectories="lua\include"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="TRUE"
|
||||
DebugInformationFormat="3"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)/lua.lib"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Source Files"
|
||||
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
|
||||
<File
|
||||
RelativePath="lua\src\lapi.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lapi.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lauxlib.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lbuffer.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lbuiltin.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lbuiltin.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\ldo.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\ldo.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lfunc.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lfunc.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lgc.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lgc.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\llex.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\llex.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lmem.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lmem.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lobject.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lobject.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lopcodes.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lparser.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lparser.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lstate.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lstate.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lstring.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lstring.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\ltable.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\ltable.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\ltask.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\ltask.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\ltm.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\ltm.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lundump.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lundump.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lvm.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lvm.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lzio.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua\src\lzio.h">
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
</VisualStudioProject>
|
5
main.cpp
5
main.cpp
@ -15,6 +15,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include <SDL.h>
|
||||
#include <SDL_video.h>
|
||||
#include <SDL_opengl.h>
|
||||
@ -25,8 +26,10 @@
|
||||
#include "registry.h"
|
||||
#include "engine.h"
|
||||
#include "mixer.h"
|
||||
#ifndef _MSC_VER
|
||||
#include <unistd.h>
|
||||
//#include <windows.h>
|
||||
#endif
|
||||
|
||||
static void saveRegistry() {
|
||||
Registry::instance()->save();
|
||||
}
|
||||
|
@ -15,6 +15,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "material.h"
|
||||
#include "colormap.h"
|
||||
#include "bits.h"
|
||||
|
@ -15,6 +15,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "mixer.h"
|
||||
#include "sound.h"
|
||||
#include "debug.h"
|
||||
|
1
mixer.h
1
mixer.h
@ -18,6 +18,7 @@
|
||||
#ifndef MIXER_H
|
||||
#define MIXER_H
|
||||
|
||||
#include "bits.h"
|
||||
#include "resource.h"
|
||||
#include <list>
|
||||
#include <SDL_audio.h>
|
||||
|
@ -15,6 +15,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "model.h"
|
||||
#include "bits.h"
|
||||
#include "resource.h"
|
||||
|
@ -15,6 +15,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "registry.h"
|
||||
#include "debug.h"
|
||||
#include <cstdlib>
|
||||
|
84
residual.rc
Normal file
84
residual.rc
Normal file
@ -0,0 +1,84 @@
|
||||
//Microsoft Developer Studio generated resource script.
|
||||
//
|
||||
#include "winresrc.h"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Icon
|
||||
//
|
||||
|
||||
// Icon with lowest ID value placed first to ensure application icon
|
||||
// remains consistent on all systems.
|
||||
//IDI_ICON1 ICON DISCARDABLE "residual.ico"
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// TEXTINCLUDE
|
||||
//
|
||||
|
||||
1 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"resource.h\0"
|
||||
END
|
||||
|
||||
2 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"#include ""afxres.h""\r\n"
|
||||
"\0"
|
||||
END
|
||||
|
||||
3 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"\r\n"
|
||||
"\0"
|
||||
END
|
||||
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
|
||||
#ifndef _MAC
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Version
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 0,0,0,0
|
||||
PRODUCTVERSION 0,0,0,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
#else
|
||||
FILEFLAGS 0x0L
|
||||
#endif
|
||||
FILEOS 0x40004L
|
||||
FILETYPE 0x1L
|
||||
FILESUBTYPE 0x0L
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904b0"
|
||||
BEGIN
|
||||
VALUE "Comments", "\0"
|
||||
VALUE "CompanyName", "ScummVM Team\0"
|
||||
VALUE "FileDescription", "http://www.scummvm.org/\0"
|
||||
VALUE "FileVersion", "0.0.0\0"
|
||||
VALUE "InternalName", "residual\0"
|
||||
VALUE "LegalCopyright", "Copyright © 2003 The ScummVM Team\0"
|
||||
VALUE "LegalTrademarks", "\0"
|
||||
VALUE "OriginalFilename", "residual.exe\0"
|
||||
VALUE "PrivateBuild", "\0"
|
||||
VALUE "ProductName", "Residual\0"
|
||||
VALUE "ProductVersion", "\0"
|
||||
VALUE "SpecialBuild", "\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1200
|
||||
END
|
||||
END
|
||||
|
||||
#endif // !_MAC
|
||||
|
27
residual.sln
Normal file
27
residual.sln
Normal file
@ -0,0 +1,27 @@
|
||||
Microsoft Visual Studio Solution File, Format Version 7.00
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "residual", "residual.vcproj", "{44D38F29-303D-4E3D-AF45-B96523BF1F9F}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua.vcproj", "{5930DA38-F3BC-41AB-BC48-FC1AB8ED75B0}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfiguration) = preSolution
|
||||
ConfigName.0 = Debug
|
||||
ConfigName.1 = Release
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectDependencies) = postSolution
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfiguration) = postSolution
|
||||
{44D38F29-303D-4E3D-AF45-B96523BF1F9F}.Debug.ActiveCfg = Debug|Win32
|
||||
{44D38F29-303D-4E3D-AF45-B96523BF1F9F}.Debug.Build.0 = Debug|Win32
|
||||
{44D38F29-303D-4E3D-AF45-B96523BF1F9F}.Release.ActiveCfg = Release|Win32
|
||||
{44D38F29-303D-4E3D-AF45-B96523BF1F9F}.Release.Build.0 = Release|Win32
|
||||
{5930DA38-F3BC-41AB-BC48-FC1AB8ED75B0}.Debug.ActiveCfg = Debug|Win32
|
||||
{5930DA38-F3BC-41AB-BC48-FC1AB8ED75B0}.Debug.Build.0 = Debug|Win32
|
||||
{5930DA38-F3BC-41AB-BC48-FC1AB8ED75B0}.Release.ActiveCfg = Release|Win32
|
||||
{5930DA38-F3BC-41AB-BC48-FC1AB8ED75B0}.Release.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityAddIns) = postSolution
|
||||
EndGlobalSection
|
||||
EndGlobal
|
261
residual.vcproj
Normal file
261
residual.vcproj
Normal file
@ -0,0 +1,261 @@
|
||||
<?xml version="1.0" encoding = "windows-1250"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.00"
|
||||
Name="residual"
|
||||
ProjectGUID="{44D38F29-303D-4E3D-AF45-B96523BF1F9F}"
|
||||
Keyword="Win32Proj">
|
||||
<Platforms>
|
||||
<Platform
|
||||
Name="Win32"/>
|
||||
</Platforms>
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory="Debug_Residual"
|
||||
IntermediateDirectory="Debug_Residual"
|
||||
ConfigurationType="1"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="lua\include"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
|
||||
MinimalRebuild="TRUE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="5"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="2"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="TRUE"
|
||||
DebugInformationFormat="4"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="$(OutDir)/residual.exe"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="$(OutDir)/residual.pdb"
|
||||
SubSystem="2"
|
||||
TargetMachine="1"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="Release_Residual"
|
||||
IntermediateDirectory="Release_Residual"
|
||||
ConfigurationType="1"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OmitFramePointers="TRUE"
|
||||
AdditionalIncludeDirectories="lua\include"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="4"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="2"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="TRUE"
|
||||
DebugInformationFormat="3"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="$(OutDir)/residual.exe"
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="TRUE"
|
||||
SubSystem="2"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
TargetMachine="1"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Source Files"
|
||||
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
|
||||
<File
|
||||
RelativePath="actor.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="actor.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="bitmap.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="bitmap.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="bits.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="color.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="colormap.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="costume.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="costume.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="debug.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="debug.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="engine.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="engine.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="hash_map.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="keyframe.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="keyframe.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lab.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lab.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="localize.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="localize.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="lua.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="main.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="material.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="material.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="mixer.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="mixer.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="model.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="model.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="registry.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="registry.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="resource.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="resource.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="scene.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="scene.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="sound.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="sound.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="stdafx.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="textobject.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="textobject.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="textsplit.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="textsplit.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="vector3d.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="walkplane.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="walkplane.h">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Resource Files"
|
||||
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
|
||||
<File
|
||||
RelativePath="README">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="TODO">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="residual.rc">
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
</VisualStudioProject>
|
@ -15,6 +15,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "resource.h"
|
||||
#include "registry.h"
|
||||
#include "bitmap.h"
|
||||
@ -25,7 +26,6 @@
|
||||
#include "model.h"
|
||||
#include "sound.h"
|
||||
#include "debug.h"
|
||||
#include <dirent.h>
|
||||
#include <cstring>
|
||||
#include <cctype>
|
||||
#include <string>
|
||||
@ -44,7 +44,7 @@ ResourceLoader::ResourceLoader() {
|
||||
int lab_counter = 0;
|
||||
|
||||
#ifdef _MSC_VER
|
||||
WIN32_FIND_DATAW find_file_data;
|
||||
WIN32_FIND_DATAA find_file_data;
|
||||
HANDLE d = FindFirstFile(dir_str.c_str(), &find_file_data);
|
||||
#else
|
||||
DIR *d = opendir(dir_str.c_str());
|
||||
@ -60,7 +60,7 @@ ResourceLoader::ResourceLoader() {
|
||||
#ifdef _MSC_VER
|
||||
do {
|
||||
int namelen = strlen(find_file_data.cFileName);
|
||||
if ((namelen > 4) && (stricmp(findFileData.cFileName + namelen - 4, ".lab") == 0)) {
|
||||
if ((namelen > 4) && (stricmp(find_file_data.cFileName + namelen - 4, ".lab") == 0)) {
|
||||
std::string fullname = dir_str + find_file_data.cFileName;
|
||||
Lab *l = new Lab(fullname.c_str());
|
||||
lab_counter++;
|
||||
@ -69,7 +69,7 @@ ResourceLoader::ResourceLoader() {
|
||||
else
|
||||
delete l;
|
||||
}
|
||||
} while (FindNextFile(d, &find_file_data) != NULL)
|
||||
} while (FindNextFile(d, &find_file_data) != NULL);
|
||||
FindClose(d);
|
||||
#else
|
||||
dirent *de;
|
||||
|
@ -15,6 +15,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "scene.h"
|
||||
#include "textsplit.h"
|
||||
#include "resource.h"
|
||||
|
@ -15,6 +15,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "sound.h"
|
||||
#include "bits.h"
|
||||
#include "debug.h"
|
||||
|
2
sound.h
2
sound.h
@ -18,8 +18,8 @@
|
||||
#ifndef SOUND_H
|
||||
#define SOUND_H
|
||||
|
||||
#include "bits.h"
|
||||
#include "resource.h"
|
||||
#include <stdint.h>
|
||||
|
||||
class Sound : public Resource {
|
||||
public:
|
||||
|
120
stdafx.h
Normal file
120
stdafx.h
Normal file
@ -0,0 +1,120 @@
|
||||
// Residual - Virtual machine to run LucasArts' 3D adventure games
|
||||
// Copyright (C) 2003 The ScummVM-Residual Team (www.scummvm.org)
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU Lesser General Public
|
||||
// License as published by the Free Software Foundation; either
|
||||
// version 2.1 of the License, or (at your option) any later version.
|
||||
//
|
||||
// This library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
// Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#ifndef _STDAFX_H
|
||||
#define _STDAFX_H
|
||||
|
||||
#if defined(_WIN32_WCE) && _WIN32_WCE < 300
|
||||
|
||||
#define NONSTANDARD_PORT
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(NONSTANDARD_PORT)
|
||||
|
||||
#include <portdefs.h>
|
||||
|
||||
#elif defined(WIN32)
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma once
|
||||
#pragma warning( disable : 4068 ) // turn off "unknown pragma" warning
|
||||
#pragma warning( disable : 4244 ) // turn off "conversion type" warning
|
||||
#endif
|
||||
|
||||
#if !defined(_WIN32_WCE)
|
||||
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
|
||||
#define NOGDICAPMASKS
|
||||
#define OEMRESOURCE
|
||||
#define NONLS
|
||||
#define NOICONS
|
||||
#define NOMCX
|
||||
#define NOPROFILER
|
||||
#define NOKANJI
|
||||
#define NOSERVICE
|
||||
#define NOMETAFILE
|
||||
#define NOCOMM
|
||||
#define NOCRYPT
|
||||
#define NOIME
|
||||
#define NOATOM
|
||||
#define NOCTLMGR
|
||||
#define NOCLIPBOARD
|
||||
#define NOMEMMGR
|
||||
#define NOSYSMETRICS
|
||||
#define NOMENUS
|
||||
#define NOOPENFILE
|
||||
#define NOWH
|
||||
#define NOSOUND
|
||||
#define NODRAWTEXT
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
#include <windows.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <io.h>
|
||||
#include <stdarg.h>
|
||||
#include <fcntl.h>
|
||||
#include <conio.h>
|
||||
#include <assert.h>
|
||||
#include <mmsystem.h>
|
||||
#include <ctype.h>
|
||||
#include <winuser.h>
|
||||
#include <direct.h>
|
||||
#define strcasecmp stricmp
|
||||
#define M_PI 3.14159265
|
||||
|
||||
#ifndef _MSC_VER
|
||||
#include <stdint.h>
|
||||
#include <dirent.h>
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
#if defined(__MORPHOS__)
|
||||
#include <devices/timer.h>
|
||||
#undef CMD_INVALID
|
||||
#endif
|
||||
#if !defined(macintosh)
|
||||
#include <sys/types.h>
|
||||
#include <sys/uio.h>
|
||||
#endif
|
||||
#if !defined (__BEOS__)
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#if defined(__QNXNTO__)
|
||||
#include <strings.h> /* For strcasecmp */
|
||||
#endif
|
||||
#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
#include <assert.h>
|
||||
#include <ctype.h>
|
||||
#include <stdint.h>
|
||||
#include <dirent.h>
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
@ -15,6 +15,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "textobject.h"
|
||||
#include "engine.h"
|
||||
#include "localize.h"
|
||||
|
@ -15,6 +15,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "textsplit.h"
|
||||
#include "debug.h"
|
||||
#include <cstdio>
|
||||
|
@ -16,6 +16,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "walkplane.h"
|
||||
#include "textsplit.h"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user