diff options
-rw-r--r-- | DirectX/lib/dinput.lib | bin | 0 -> 161464 bytes | |||
-rw-r--r-- | FoundationEx/List.inl | 6 | ||||
-rw-r--r-- | Stars45/Shot.h | 2 | ||||
-rw-r--r-- | Stars45/Stars.vcxproj | 30 | ||||
-rw-r--r-- | libpng/Debug/libpng.lib | bin | 0 -> 991614 bytes | |||
-rw-r--r-- | libpng/Release/libpng.lib | bin | 0 -> 1767996 bytes | |||
-rw-r--r-- | libpng/libpng.vcxproj | 26 | ||||
-rw-r--r-- | nGenEx/nGenEx.vcxproj | 2 | ||||
-rw-r--r-- | zlib/Debug/Zlib.lib | bin | 0 -> 228696 bytes | |||
-rw-r--r-- | zlib/Release/Zlib.lib | bin | 0 -> 203822 bytes |
10 files changed, 39 insertions, 27 deletions
diff --git a/DirectX/lib/dinput.lib b/DirectX/lib/dinput.lib Binary files differnew file mode 100644 index 0000000..7c93a65 --- /dev/null +++ b/DirectX/lib/dinput.lib diff --git a/FoundationEx/List.inl b/FoundationEx/List.inl index d868e65..0dd6134 100644 --- a/FoundationEx/List.inl +++ b/FoundationEx/List.inl @@ -243,10 +243,8 @@ template <class T> bool List<T>::contains(const T* val) const
{
if (val) {
- for (int i = 0; i < items; i++) {
- if (array[i] && ((*array[i])==(*val)))
- return true;
- }
+ if (index(val) != -1)
+ return true;
}
return false;
diff --git a/Stars45/Shot.h b/Stars45/Shot.h index 52f5a6c..2bd5d06 100644 --- a/Stars45/Shot.h +++ b/Stars45/Shot.h @@ -96,6 +96,8 @@ public: virtual bool Update(SimObject* obj);
virtual const char* GetObserverName() const;
+ int operator == (const Shot& s) const { return id == s.id; }
+
protected:
const Ship* owner;
diff --git a/Stars45/Stars.vcxproj b/Stars45/Stars.vcxproj index f0c3bdc..ce63580 100644 --- a/Stars45/Stars.vcxproj +++ b/Stars45/Stars.vcxproj @@ -31,6 +31,7 @@ <ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <UseOfAtl>Static</UseOfAtl>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -48,25 +49,27 @@ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>.\Debug\</OutDir>
- <IntDir>.\Debug\</IntDir>
+ <OutDir>$(SolutionDir)\$(Configuration)\</OutDir>
+ <IntDir>$(SolutionDir)\$(Configuration)\</IntDir>
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(DXSDK_DIR)\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>.\Release\</OutDir>
- <IntDir>.\Release\</IntDir>
+ <OutDir>$(SolutionDir)\$(Configuration)\</OutDir>
+ <IntDir>$(SolutionDir)\$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(DXSDK_DIR)\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
<IncludePath>$(DXSDK_DIR)\include;$(IncludePath)</IncludePath>
+ <OutDir>$(SolutionDir)\$(Configuration)\</OutDir>
+ <IntDir>$(SolutionDir)\$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
- <FunctionLevelLinking>false</FunctionLevelLinking>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
<Optimization>Disabled</Optimization>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
@@ -80,6 +83,7 @@ <ObjectFileName>.\Debug\</ObjectFileName>
<ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Midl>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -100,8 +104,10 @@ <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
- <OutputFile>Game/Stars_d.exe</OutputFile>
- <AdditionalDependencies>..\Opcode\OpcodeLib\Debug\OpcodeLib.lib;..\ngenex\debug\ngenex.lib;..\netex\debug\netex.lib;..\zlib\debug\zlib.lib;..\libpng\debug\libpng.lib;wsock32.lib;dinput.lib;dsound.lib;d3d9.lib;d3dx9.lib;dxguid.lib;winmm.lib;version.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;Vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(SolutionDir)$(Configuration)\$(SolutionName).exe</OutputFile>
+ <AdditionalDependencies>..\Opcode\Debug\Opcode_D.lib;..\ngenex\debug\ngenex.lib;..\netex\debug\netex.lib;..\zlib\debug\zlib.lib;..\libpng\debug\libpng.lib;wsock32.lib;..\DirectX\lib\dinput.lib;dsound.lib;d3d9.lib;d3dx9.lib;dxguid.lib;winmm.lib;version.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;Vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x86\;..\oggvorbis\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -139,8 +145,14 @@ <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
- <OutputFile>Game/Stars.exe</OutputFile>
- <AdditionalDependencies>..\Opcode\OpcodeLib\Release\OpcodeLib.lib;..\ngenex\release\ngenex.lib;..\netex\release\netex.lib;..\zlib\release\zlib.lib;..\libpng\release\libpng.lib;wsock32.lib;dinput.lib;dsound.lib;d3d9.lib;d3dx9.lib;dxguid.lib;winmm.lib;version.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;Vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(SolutionDir)$(Configuration)\$(SolutionName).exe</OutputFile>
+ <AdditionalDependencies>..\Opcode\Release\Opcode.lib;..\ngenex\release\ngenex.lib;..\netex\release\netex.lib;..\zlib\release\zlib.lib;..\libpng\release\libpng.lib;wsock32.lib;..\DirectX\lib\dinput.lib;dsound.lib;d3d9.lib;d3dx9.lib;dxguid.lib;winmm.lib;version.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;Vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x86\;..\oggvorbis\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
+ <Link>
+ <OutputFile>$(SolutionDir)$(Configuration)\$(SolutionName).exe</OutputFile>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/libpng/Debug/libpng.lib b/libpng/Debug/libpng.lib Binary files differnew file mode 100644 index 0000000..20405ba --- /dev/null +++ b/libpng/Debug/libpng.lib diff --git a/libpng/Release/libpng.lib b/libpng/Release/libpng.lib Binary files differnew file mode 100644 index 0000000..9ff5b62 --- /dev/null +++ b/libpng/Release/libpng.lib diff --git a/libpng/libpng.vcxproj b/libpng/libpng.vcxproj index d3e783b..4c17fe9 100644 --- a/libpng/libpng.vcxproj +++ b/libpng/libpng.vcxproj @@ -151,7 +151,7 @@ <PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Inferno|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Inferno|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
@@ -247,7 +247,7 @@ <Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)libpng.lib</OutputFile>
+ <OutputFile>$(ProjectDir)\$(Configuration)\libpng.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -278,7 +278,7 @@ <Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)libpng.lib</OutputFile>
+ <OutputFile>$(ProjectDir)\$(Configuration)\libpng.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -311,7 +311,7 @@ <Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)libpng.lib</OutputFile>
+ <OutputFile>$(ProjectDir)\$(Configuration)\libpng.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -344,7 +344,7 @@ <Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)libpng.lib</OutputFile>
+ <OutputFile>$(ProjectDir)\$(Configuration)\libpng.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -377,7 +377,7 @@ <Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)libpng.lib</OutputFile>
+ <OutputFile>$(ProjectDir)\$(Configuration)\libpng.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -410,7 +410,7 @@ <Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)libpng.lib</OutputFile>
+ <OutputFile>$(ProjectDir)\$(Configuration)\libpng.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -452,7 +452,7 @@ <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)libpng.lib</OutputFile>
+ <OutputFile>$(ProjectDir)\$(Configuration)\libpng.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -489,7 +489,7 @@ <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)libpng.lib</OutputFile>
+ <OutputFile>$(ProjectDir)\$(Configuration)\libpng.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -527,7 +527,7 @@ <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)libpng.lib</OutputFile>
+ <OutputFile>$(ProjectDir)\$(Configuration)\libpng.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -565,7 +565,7 @@ <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)libpng.lib</OutputFile>
+ <OutputFile>$(ProjectDir)\$(Configuration)\libpng.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -608,7 +608,7 @@ <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)libpng.lib</OutputFile>
+ <OutputFile>$(ProjectDir)\$(Configuration)\libpng.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -651,7 +651,7 @@ <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
- <OutputFile>$(OutDir)libpng.lib</OutputFile>
+ <OutputFile>$(ProjectDir)\$(Configuration)\libpng.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
diff --git a/nGenEx/nGenEx.vcxproj b/nGenEx/nGenEx.vcxproj index 697eb8e..e22f00d 100644 --- a/nGenEx/nGenEx.vcxproj +++ b/nGenEx/nGenEx.vcxproj @@ -55,7 +55,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\Release\</OutDir>
<IntDir>.\Release\</IntDir>
- <IncludePath>$(DXSDK_DIR)\include;$(IncludePath)</IncludePath>
+ <IncludePath>..\oggvorbis\include;$(DXSDK_DIR)\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
<IncludePath>$(DXSDK_DIR)\include;$(IncludePath)</IncludePath>
diff --git a/zlib/Debug/Zlib.lib b/zlib/Debug/Zlib.lib Binary files differnew file mode 100644 index 0000000..0c660a4 --- /dev/null +++ b/zlib/Debug/Zlib.lib diff --git a/zlib/Release/Zlib.lib b/zlib/Release/Zlib.lib Binary files differnew file mode 100644 index 0000000..e6d2cbe --- /dev/null +++ b/zlib/Release/Zlib.lib |