no message
This was SVN commit r63.
This commit is contained in:
parent
1ef86fc2fb
commit
5faca15d7f
@ -156,7 +156,7 @@ static int ilog2(const float x)
|
||||
}
|
||||
|
||||
|
||||
long round_up(long val, int multiple)
|
||||
uintptr_t round_up(uintptr_t val, uintptr_t multiple)
|
||||
{
|
||||
val += multiple-1;
|
||||
val -= val % multiple;
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
#endif
|
||||
|
||||
// check if compiler supports C99
|
||||
// avoid ICC warning about undefined macros in #if
|
||||
// nested #if to avoid ICC warning about undefined macro value
|
||||
#undef HAVE_C99
|
||||
#ifdef __STDC_VERSION__
|
||||
#if __STDC_VERSION__ >= 199901L)
|
||||
@ -145,7 +145,7 @@ extern bool is_pow2(int n);
|
||||
extern int ilog2(const int n);
|
||||
|
||||
|
||||
extern long round_up(long val, int multiple);
|
||||
extern uintptr_t round_up(uintptr_t val, uintptr_t multiple);
|
||||
|
||||
|
||||
// provide fminf for non-C99 compilers
|
||||
|
||||
@ -257,20 +257,6 @@ int pthread_create(pthread_t* /* thread */, const void* /* attr */, void*(* func
|
||||
}
|
||||
|
||||
|
||||
static HANDLE m2h(pthread_mutex_t* m)
|
||||
{
|
||||
if(!m)
|
||||
return INVALID_HANDLE_VALUE;
|
||||
HANDLE h;
|
||||
__asm
|
||||
{
|
||||
mov edx, [m]
|
||||
mov eax, [edx]
|
||||
mov [h], eax
|
||||
}
|
||||
return h;
|
||||
}
|
||||
|
||||
pthread_mutex_t pthread_mutex_initializer()
|
||||
{
|
||||
return CreateMutex(0, 0, 0);
|
||||
@ -286,17 +272,17 @@ int pthread_mutex_init(pthread_mutex_t* m, const pthread_mutexattr_t*)
|
||||
|
||||
int pthread_mutex_lock(pthread_mutex_t* m)
|
||||
{
|
||||
return WaitForSingleObject(m2h(m), INFINITE) == WAIT_OBJECT_0? 0 : -1;
|
||||
return WaitForSingleObject(*m, INFINITE) == WAIT_OBJECT_0? 0 : -1;
|
||||
}
|
||||
|
||||
int pthread_mutex_trylock(pthread_mutex_t* m)
|
||||
{
|
||||
return WaitForSingleObject(m2h(m), 0) == WAIT_OBJECT_0? 0 : -1;
|
||||
return WaitForSingleObject(*m, 0) == WAIT_OBJECT_0? 0 : -1;
|
||||
}
|
||||
|
||||
int pthread_mutex_unlock(pthread_mutex_t* m)
|
||||
{
|
||||
return ReleaseMutex(m2h(m))? 0 : -1;
|
||||
return ReleaseMutex(*m)? 0 : -1;
|
||||
}
|
||||
|
||||
|
||||
@ -500,13 +486,10 @@ u16_t htons(u16_t s)
|
||||
|
||||
void entry(void)
|
||||
{
|
||||
// alloc __pio, __iob?
|
||||
// replace CRT init?
|
||||
|
||||
// header also removed to prevent calling Winsock functions
|
||||
// note: winsock header is also removed by this define
|
||||
#ifndef NO_WINSOCK
|
||||
char d[1024];
|
||||
WSAStartup(0x0101, d);
|
||||
WSAStartup(0x0002, d); // want 2.0
|
||||
#endif
|
||||
|
||||
mainCRTStartup();
|
||||
|
||||
@ -321,7 +321,7 @@ extern pthread_t pthread_self();
|
||||
extern int pthread_setschedparam(pthread_t thread, int policy, const struct sched_param* param);
|
||||
extern int pthread_create(pthread_t* thread, const void* attr, void*(*IMP)(void*), void* arg);
|
||||
|
||||
typedef void *pthread_mutex_t;
|
||||
typedef void* pthread_mutex_t;
|
||||
typedef void pthread_mutexattr_t;
|
||||
|
||||
extern pthread_mutex_t pthread_mutex_initializer();
|
||||
@ -353,6 +353,9 @@ typedef unsigned short sa_family_t;
|
||||
|
||||
IMP(int, socket, (int, int, int))
|
||||
IMP(int, setsockopt, (int, int, int, const void*, socklen_t))
|
||||
IMP(int, getsockopt, (int, int, int, void*, socklen_t*))
|
||||
|
||||
|
||||
|
||||
struct sockaddr;
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
#include <cstdlib>
|
||||
#include <cstdio>
|
||||
|
||||
#include <winsock2.h>
|
||||
//#include <winsock2.h>
|
||||
#include "posix.h"
|
||||
#include "win.h"
|
||||
#include "misc.h"
|
||||
@ -28,7 +28,7 @@
|
||||
|
||||
// Win32 functions require sector aligned transfers.
|
||||
// updated by aio_open; changes don't affect aio_return
|
||||
static u32 sector_size = 4096;
|
||||
static size_t sector_size = 4096;
|
||||
|
||||
// async-capable handles to each lowio file
|
||||
static HANDLE* aio_hs;
|
||||
@ -45,9 +45,9 @@ struct Req
|
||||
|
||||
// read into a separate align buffer if necessary
|
||||
// (note: unaligned writes aren't supported. see aio_rw)
|
||||
u32 pad; // offset from starting sector
|
||||
size_t pad; // offset from starting sector
|
||||
void* buf; // reused; resize if too small
|
||||
u32 buf_size;
|
||||
size_t buf_size;
|
||||
};
|
||||
|
||||
static const int MAX_REQS = 4;
|
||||
@ -90,10 +90,10 @@ static Req* find_req(const aiocb* cb)
|
||||
|
||||
static void cleanup(void)
|
||||
{
|
||||
uint i;
|
||||
int i;
|
||||
|
||||
// close files
|
||||
for(i = 0; i < hs_cap; i++)
|
||||
for(i = 0; i < (int)hs_cap; i++)
|
||||
{
|
||||
HANDLE h = aio_h(i);
|
||||
if(h != INVALID_HANDLE_VALUE)
|
||||
@ -152,13 +152,10 @@ int alloc_handle_entry(int fd)
|
||||
// alloc aio_hs entry
|
||||
if((unsigned)fd >= hs_cap)
|
||||
{
|
||||
uint hs_cap2 = round_up(fd+8, 8);
|
||||
uint hs_cap2 = (uint)round_up(fd+8, 8);
|
||||
HANDLE* aio_hs2 = (HANDLE*)realloc(aio_hs, hs_cap2*sizeof(HANDLE));
|
||||
if(!aio_hs2)
|
||||
{
|
||||
UNLOCK(open)
|
||||
return -1;
|
||||
}
|
||||
|
||||
for(uint i = hs_cap; i < hs_cap2; i++)
|
||||
aio_hs2[i] = INVALID_HANDLE_VALUE;
|
||||
@ -176,7 +173,10 @@ int aio_open_winhandle(HANDLE fd)
|
||||
LOCK(open)
|
||||
|
||||
if (alloc_handle_entry(HANDLE2INT(fd)) == -1)
|
||||
{
|
||||
UNLOCK(open)
|
||||
return -1;
|
||||
}
|
||||
|
||||
aio_hs[HANDLE2INT(fd)]=fd;
|
||||
|
||||
@ -233,6 +233,7 @@ UNLOCK(open)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
// called by aio_read, aio_write, and lio_listio
|
||||
// cb->aio_lio_opcode specifies desired operation
|
||||
static int aio_rw(struct aiocb* cb)
|
||||
@ -263,19 +264,27 @@ LOCK(reqs)
|
||||
|
||||
UNLOCK(reqs)
|
||||
|
||||
unsigned long opt=0;
|
||||
int optlen=sizeof(opt);
|
||||
|
||||
// align
|
||||
r->pad = cb->aio_offset % sector_size; // offset to start of sector
|
||||
u32 ofs = cb->aio_offset - r->pad;
|
||||
u32 size = round_up((long)cb->aio_nbytes+r->pad, sector_size);
|
||||
size_t ofs = 0;
|
||||
size_t size = cb->aio_nbytes;
|
||||
void* buf = cb->aio_buf;
|
||||
const size_t _buf = (char*)buf - (char*)0;
|
||||
if (getsockopt((SOCKET)h, SOL_SOCKET, SO_TYPE, (char *)&opt, &optlen)==-1 &&
|
||||
(WSAGetLastError()==WSAENOTSOCK))
|
||||
|
||||
#define SOL_SOCKET 0xffff
|
||||
#define SO_TYPE 0x1008
|
||||
|
||||
unsigned long opt = 0;
|
||||
socklen_t optlen = sizeof(opt);
|
||||
if (getsockopt((int)h, SOL_SOCKET, SO_TYPE, &opt, &optlen) != -1)
|
||||
// || (WSAGetLastError() != WSAENOTSOCK))
|
||||
cb->aio_offset = 0;
|
||||
else
|
||||
{
|
||||
if(r->pad || _buf % sector_size)
|
||||
// align
|
||||
r->pad = cb->aio_offset % sector_size; // offset to start of sector
|
||||
ofs = cb->aio_offset - r->pad;
|
||||
size += r->pad + sector_size-1;
|
||||
size &= sector_size-1; // align (sector_size = 2**n)
|
||||
|
||||
if(r->pad || (uintptr_t)buf % sector_size)
|
||||
{
|
||||
// current align buffer is too small - resize
|
||||
if(r->buf_size < size)
|
||||
@ -297,15 +306,16 @@ UNLOCK(reqs)
|
||||
buf = r->buf;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
ofs=0;
|
||||
size=cb->aio_nbytes;
|
||||
}
|
||||
|
||||
#if _MSC_VER >= 1300
|
||||
r->ovl.Pointer = (void*)ofs;
|
||||
#else
|
||||
r->ovl.Offset = ofs;
|
||||
#endif
|
||||
|
||||
DWORD size32 = (DWORD)(size & 0xffffffff);
|
||||
u32 status = (cb->aio_lio_opcode == LIO_READ)?
|
||||
ReadFile(h, buf, size, NULL, &r->ovl) : WriteFile(h, buf, size, NULL, &r->ovl);
|
||||
ReadFile(h, buf, size32, 0, &r->ovl) : WriteFile(h, buf, size32, 0, &r->ovl);
|
||||
|
||||
if(status || GetLastError() == ERROR_IO_PENDING)
|
||||
return 0;
|
||||
|
||||
@ -57,18 +57,24 @@
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
// VC6 windows.h may not have defined these
|
||||
// VC6 windows.h doesn't define these
|
||||
#ifndef INVALID_FILE_ATTRIBUTES
|
||||
#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
|
||||
#endif
|
||||
|
||||
#ifndef PROCESSOR_ARCHITECTURE_AMD64
|
||||
#define PROCESSOR_ARCHITECTURE_AMD64 9
|
||||
#endif
|
||||
|
||||
// end VC6 fixes
|
||||
|
||||
|
||||
// HACK: warning-free definition for ICC (value is -1)
|
||||
#undef INVALID_HANDLE_VALUE
|
||||
const HANDLE INVALID_HANDLE_VALUE = (HANDLE)(((char*)0) + ~0);
|
||||
|
||||
#define HANDLE2INT(_h) ((char *)_h - (char *)0)
|
||||
|
||||
extern "C" {
|
||||
extern int _get_osfhandle(int);
|
||||
extern int _open(const char* fn, int mode, ...);
|
||||
@ -77,14 +83,12 @@ extern int aio_open_winhandle(HANDLE);
|
||||
|
||||
#ifndef NO_WINSOCK
|
||||
#ifdef _MSC_VER
|
||||
#pragma comment(lib, "wsock32.lib")
|
||||
#pragma comment(lib, "ws2_32.lib")
|
||||
#endif
|
||||
|
||||
#ifndef _WINSOCKAPI_
|
||||
extern __declspec(dllimport) int __stdcall WSAStartup(WORD, char*);
|
||||
#endif
|
||||
extern __declspec(dllimport) int __stdcall WSAStartup(WORD, void*);
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
#endif // #ifndef __WIN_H__
|
||||
#endif // #ifdef _WIN32
|
||||
@ -98,7 +98,7 @@ _ulong CStr::ToULong() const
|
||||
|
||||
_float CStr::ToFloat() const
|
||||
{
|
||||
return _tstod(m_String.c_str(), NULL);
|
||||
return (_float)_tstod(m_String.c_str(), NULL);
|
||||
}
|
||||
|
||||
_double CStr::ToDouble() const
|
||||
@ -139,7 +139,7 @@ _long CStr::ReverseFind(const CStr &Str)
|
||||
CStr CStr::LowerCase()
|
||||
{
|
||||
tstring NewTString = m_String;
|
||||
for (long i = 0; i < m_String.length(); i++)
|
||||
for (size_t i = 0; i < m_String.length(); i++)
|
||||
NewTString[i] = _totlower(m_String[i]);
|
||||
|
||||
return CStr(NewTString);
|
||||
@ -148,7 +148,7 @@ CStr CStr::LowerCase()
|
||||
CStr CStr::UpperCase()
|
||||
{
|
||||
tstring NewTString = m_String;
|
||||
for (long i = 0; i < m_String.length(); i++)
|
||||
for (size_t i = 0; i < m_String.length(); i++)
|
||||
NewTString[i] = _totlower(m_String[i]);
|
||||
|
||||
return CStr(NewTString);
|
||||
@ -159,7 +159,7 @@ CStr CStr::UpperCase()
|
||||
CStr CStr::LCase()
|
||||
{
|
||||
tstring NewTString = m_String;
|
||||
for (long i = 0; i < m_String.length(); i++)
|
||||
for (size_t i = 0; i < m_String.length(); i++)
|
||||
NewTString[i] = _totlower(m_String[i]);
|
||||
|
||||
return CStr(NewTString);
|
||||
@ -168,7 +168,7 @@ CStr CStr::LCase()
|
||||
CStr CStr::UCase()
|
||||
{
|
||||
tstring NewTString = m_String;
|
||||
for (long i = 0; i < m_String.length(); i++)
|
||||
for (size_t i = 0; i < m_String.length(); i++)
|
||||
NewTString[i] = _totlower(m_String[i]);
|
||||
|
||||
return CStr(NewTString);
|
||||
@ -219,7 +219,7 @@ void CStr::Replace(const CStr &ToReplace, const CStr &ReplaceWith)
|
||||
// returns a trimed string, removes whitespace from the left/right/both
|
||||
CStr CStr::Trim(PS_TRIM_MODE Mode)
|
||||
{
|
||||
long Left, Right;
|
||||
size_t Left, Right;
|
||||
|
||||
|
||||
switch (Mode)
|
||||
@ -363,7 +363,7 @@ CStr::operator const TCHAR*()
|
||||
|
||||
TCHAR &CStr::operator[](_int n)
|
||||
{
|
||||
assert(n < m_String.length());
|
||||
assert((size_t)n < m_String.length());
|
||||
return m_String[n];
|
||||
}
|
||||
|
||||
@ -374,7 +374,7 @@ TCHAR &CStr::operator[](_uint n)
|
||||
}
|
||||
TCHAR &CStr::operator[](_long n)
|
||||
{
|
||||
assert(n < m_String.length());
|
||||
assert((size_t)n < m_String.length());
|
||||
return m_String[n];
|
||||
}
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@ More Info:
|
||||
#include <string> // Used for basic string functionality
|
||||
#include <iostream>
|
||||
|
||||
#include "..\lib\posix.h"
|
||||
#include "posix.h"
|
||||
|
||||
#include <cstdlib>
|
||||
using namespace std;
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
Microsoft Visual Studio Solution File, Format Version 8.00
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ps", "ps.vcproj", "{12FFD16D-5373-425F-852E-D81421005AE6}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfiguration) = preSolution
|
||||
Debug = Debug
|
||||
Release = Release
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfiguration) = postSolution
|
||||
{12FFD16D-5373-425F-852E-D81421005AE6}.Debug.ActiveCfg = Debug|Win32
|
||||
{12FFD16D-5373-425F-852E-D81421005AE6}.Debug.Build.0 = Debug|Win32
|
||||
{12FFD16D-5373-425F-852E-D81421005AE6}.Release.ActiveCfg = Release|Win32
|
||||
{12FFD16D-5373-425F-852E-D81421005AE6}.Release.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityAddIns) = postSolution
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
@ -1,362 +0,0 @@
|
||||
<?xml version="1.0" encoding = "Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.10"
|
||||
Name="ps"
|
||||
ProjectGUID="{12FFD16D-5373-425F-852E-D81421005AE6}"
|
||||
Keyword="Win32Proj">
|
||||
<Platforms>
|
||||
<Platform
|
||||
Name="Win32"/>
|
||||
</Platforms>
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory="..\..\binaries"
|
||||
IntermediateDirectory="Debug"
|
||||
ConfigurationType="1"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\lib"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
|
||||
MinimalRebuild="TRUE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
DebugInformationFormat="4">
|
||||
<IntelOptions
|
||||
Optimization="0"
|
||||
MinimalRebuild="1"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
AllOptions="/c /I "../lib" /ZI /nologo /W3 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Gm /EHsc /RTC1 /MTd /Fo"Debug/" /Fd"Debug/vc70.pdb" /Gd /TP"/>
|
||||
</Tool>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="$(OutDir)/ps_dbg.vc7.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="$(OutDir)/ps_dbg.vc7.pdb"
|
||||
SubSystem="2"
|
||||
EntryPointSymbol="entry"
|
||||
TargetMachine="1">
|
||||
<IntelOptions
|
||||
AllOptions="/NOLOGO /OUT:"..\..\binaries/ps_dbg.vc7.exe" /INCREMENTAL /DEBUG /PDB:"..\..\binaries/ps_dbg.vc7.pdb" /SUBSYSTEM:WINDOWS /TLBID:1 /ENTRY:"entry" /MACHINE:IX86 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>
|
||||
</Tool>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="..\..\binaries"
|
||||
IntermediateDirectory="Release"
|
||||
ConfigurationType="1"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories="..\lib"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
|
||||
RuntimeLibrary="0"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="TRUE"
|
||||
DebugInformationFormat="3">
|
||||
<IntelOptions
|
||||
RuntimeLibrary="0"
|
||||
AllOptions="/c /I "../lib" /Zi /nologo /W3 /Wp64 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /EHsc /MT /Fo"Release/" /Fd"Release/vc70.pdb" /Gd /TP"/>
|
||||
</Tool>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="$(OutDir)/ps.vc7.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="$(OutDir)/ps.vc7.pdb"
|
||||
SubSystem="2"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
EntryPointSymbol="entry"
|
||||
TargetMachine="1">
|
||||
<IntelOptions
|
||||
AllOptions="/NOLOGO /OUT:"..\..\binaries/ps.vc7.exe" /INCREMENTAL:NO /DEBUG /PDB:"..\..\binaries/ps.vc7.pdb" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /TLBID:1 /ENTRY:"entry" /MACHINE:IX86 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>
|
||||
</Tool>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References/>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="terrain"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath="..\terrain\Camera.cpp"/>
|
||||
<File
|
||||
RelativePath="..\terrain\Camera.h"/>
|
||||
<File
|
||||
RelativePath="..\terrain\Frustum.cpp"/>
|
||||
<File
|
||||
RelativePath="..\terrain\Frustum.h"/>
|
||||
<File
|
||||
RelativePath="..\terrain\MathUtil.h"/>
|
||||
<File
|
||||
RelativePath="..\terrain\Matrix3D.cpp"/>
|
||||
<File
|
||||
RelativePath="..\terrain\Matrix3D.h"/>
|
||||
<File
|
||||
RelativePath="..\terrain\MiniPatch.cpp"/>
|
||||
<File
|
||||
RelativePath="..\terrain\MiniPatch.h"/>
|
||||
<File
|
||||
RelativePath="..\terrain\Patch.cpp"/>
|
||||
<File
|
||||
RelativePath="..\terrain\Patch.h"/>
|
||||
<File
|
||||
RelativePath="..\terrain\Plane.cpp"/>
|
||||
<File
|
||||
RelativePath="..\terrain\Plane.h"/>
|
||||
<File
|
||||
RelativePath="..\terrain\Renderer.cpp"/>
|
||||
<File
|
||||
RelativePath="..\terrain\Renderer.h"/>
|
||||
<File
|
||||
RelativePath="..\terrain\Terrain.cpp"/>
|
||||
<File
|
||||
RelativePath="..\terrain\Terrain.h"/>
|
||||
<File
|
||||
RelativePath="..\terrain\terrainMain.cpp"/>
|
||||
<File
|
||||
RelativePath="..\terrain\TerrGlobals.h"/>
|
||||
<File
|
||||
RelativePath="..\terrain\Types.h"/>
|
||||
<File
|
||||
RelativePath="..\terrain\Vector3D.cpp"/>
|
||||
<File
|
||||
RelativePath="..\terrain\Vector3D.h"/>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="gui"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath="..\gui\CButton.cpp"/>
|
||||
<File
|
||||
RelativePath="..\gui\CButton.h"/>
|
||||
<File
|
||||
RelativePath="..\gui\CGUI.cpp"/>
|
||||
<File
|
||||
RelativePath="..\gui\CGUI.h"/>
|
||||
<File
|
||||
RelativePath="..\gui\CGUIButtonBehavior.cpp"/>
|
||||
<File
|
||||
RelativePath="..\gui\CGUIButtonBehavior.h"/>
|
||||
<File
|
||||
RelativePath="..\gui\CGUIObject.cpp"/>
|
||||
<File
|
||||
RelativePath="..\gui\CGUIObject.h"/>
|
||||
<File
|
||||
RelativePath="..\gui\CGUISettingsObject.cpp"/>
|
||||
<File
|
||||
RelativePath="..\gui\CGUISettingsObject.h"/>
|
||||
<File
|
||||
RelativePath="..\gui\CGUISprite.cpp"/>
|
||||
<File
|
||||
RelativePath="..\gui\CGUISprite.h"/>
|
||||
<File
|
||||
RelativePath="..\gui\GUI.h"/>
|
||||
<File
|
||||
RelativePath="..\gui\GUIbase.cpp"/>
|
||||
<File
|
||||
RelativePath="..\gui\GUIbase.h"/>
|
||||
<File
|
||||
RelativePath="..\gui\GUIutil.cpp"/>
|
||||
<File
|
||||
RelativePath="..\gui\GUIutil.h"/>
|
||||
<File
|
||||
RelativePath="..\gui\XercesErrorHandler.cpp"/>
|
||||
<File
|
||||
RelativePath="..\gui\XercesErrorHandler.h"/>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="ps"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath="..\ps\BaseEntity.h"/>
|
||||
<File
|
||||
RelativePath="..\ps\Config.cpp"/>
|
||||
<File
|
||||
RelativePath="..\ps\Config.h"/>
|
||||
<File
|
||||
RelativePath="..\ps\CStr.cpp"/>
|
||||
<File
|
||||
RelativePath="..\ps\CStr.h"/>
|
||||
<File
|
||||
RelativePath="..\ps\Encryption.cpp"/>
|
||||
<File
|
||||
RelativePath="..\ps\Encryption.h"/>
|
||||
<File
|
||||
RelativePath="..\ps\Error.h"/>
|
||||
<File
|
||||
RelativePath="..\ps\LogFile.cpp"/>
|
||||
<File
|
||||
RelativePath="..\ps\LogFile.h"/>
|
||||
<File
|
||||
RelativePath="..\ps\MathUtil.cpp"/>
|
||||
<File
|
||||
RelativePath="..\ps\MathUtil.h"/>
|
||||
<File
|
||||
RelativePath="..\ps\Parser.cpp"/>
|
||||
<File
|
||||
RelativePath="..\ps\Parser.h"/>
|
||||
<File
|
||||
RelativePath="..\ps\Prometheus.cpp"/>
|
||||
<File
|
||||
RelativePath="..\ps\Prometheus.h"/>
|
||||
<File
|
||||
RelativePath="..\ps\Singleton.h"/>
|
||||
<File
|
||||
RelativePath="..\ps\Sound.h"/>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="lib"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath="..\lib\detect.cpp"/>
|
||||
<File
|
||||
RelativePath="..\lib\detect.h"/>
|
||||
<File
|
||||
RelativePath="..\lib\font.cpp"/>
|
||||
<File
|
||||
RelativePath="..\lib\font.h"/>
|
||||
<File
|
||||
RelativePath="..\lib\glext_funcs.h"/>
|
||||
<File
|
||||
RelativePath="..\lib\ia32.cpp"/>
|
||||
<File
|
||||
RelativePath="..\lib\ia32.h"/>
|
||||
<File
|
||||
RelativePath="..\lib\input.cpp"/>
|
||||
<File
|
||||
RelativePath="..\lib\input.h"/>
|
||||
<File
|
||||
RelativePath="..\lib\mem.cpp"/>
|
||||
<File
|
||||
RelativePath="..\lib\mem.h"/>
|
||||
<File
|
||||
RelativePath="..\lib\memcpy.cpp"/>
|
||||
<File
|
||||
RelativePath="..\lib\misc.cpp"/>
|
||||
<File
|
||||
RelativePath="..\lib\misc.h"/>
|
||||
<File
|
||||
RelativePath="..\lib\ogl.cpp"/>
|
||||
<File
|
||||
RelativePath="..\lib\ogl.h"/>
|
||||
<File
|
||||
RelativePath="..\lib\posix.cpp"/>
|
||||
<File
|
||||
RelativePath="..\lib\posix.h"/>
|
||||
<File
|
||||
RelativePath="..\lib\res.cpp"/>
|
||||
<File
|
||||
RelativePath="..\lib\res.h"/>
|
||||
<File
|
||||
RelativePath="..\lib\tex.cpp"/>
|
||||
<File
|
||||
RelativePath="..\lib\tex.h"/>
|
||||
<File
|
||||
RelativePath="..\lib\time.cpp"/>
|
||||
<File
|
||||
RelativePath="..\lib\time.h"/>
|
||||
<File
|
||||
RelativePath="..\lib\types.h"/>
|
||||
<File
|
||||
RelativePath="..\lib\vfs.cpp"/>
|
||||
<File
|
||||
RelativePath="..\lib\vfs.h"/>
|
||||
<File
|
||||
RelativePath="..\lib\win.h"/>
|
||||
<File
|
||||
RelativePath="..\lib\wsdl.cpp"/>
|
||||
<File
|
||||
RelativePath="..\lib\wsdl.h"/>
|
||||
<File
|
||||
RelativePath="..\lib\zip.cpp"/>
|
||||
<File
|
||||
RelativePath="..\lib\zip.h"/>
|
||||
<Filter
|
||||
Name="posix"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath="..\lib\posix\aio.cpp"/>
|
||||
<File
|
||||
RelativePath="..\lib\posix\aio.h"/>
|
||||
</Filter>
|
||||
</Filter>
|
||||
<File
|
||||
RelativePath="..\main.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj">
|
||||
<IntelOptions
|
||||
AllOptions="/c /I "../lib" /ZI /nologo /W3 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Gm /EHsc /RTC1 /MTd /Fo"Debug/main1.obj" /Fd"Debug/vc70.pdb" /Gd /TP"/>
|
||||
</Tool>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj">
|
||||
<IntelOptions
|
||||
AllOptions="/c /I "../lib" /Zi /nologo /W3 /Wp64 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /EHsc /MT /Fo"Release/main1.obj" /Fd"Release/vc70.pdb" /Gd /TP"/>
|
||||
</Tool>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
</Files>
|
||||
<Globals/>
|
||||
</VisualStudioProject>
|
||||
Loading…
Reference in New Issue
Block a user