fix project files

This commit is contained in:
Ian Curtis 2017-03-27 22:01:31 +00:00
parent 3fefff36c2
commit f320af2049
4 changed files with 38 additions and 9 deletions

View file

@ -56,6 +56,7 @@
#include <cstdarg> #include <cstdarg>
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <algorithm>
#include "Pkgs/glew.h" #include "Pkgs/glew.h"
#ifdef SUPERMODEL_OSX #ifdef SUPERMODEL_OSX
#include <SDL/SDL.h> #include <SDL/SDL.h>

View file

@ -29,7 +29,7 @@ namespace Util
template <typename T> template <typename T>
struct IntegerEncodableAsHex struct IntegerEncodableAsHex
{ {
static constexpr const bool value = std::is_integral<T>::value && sizeof(T) >= 2 && sizeof(T) <= 8; static const bool value = std::is_integral<T>::value && sizeof(T) >= 2 && sizeof(T) <= 8;
}; };
// This case should never actually be called // This case should never actually be called

View file

@ -244,7 +244,6 @@ xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDi
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\Src\BlockFile.cpp" /> <ClCompile Include="..\Src\BlockFile.cpp" />
<ClCompile Include="..\Src\Config.cpp" />
<ClCompile Include="..\Src\CPU\68K\68K.cpp" /> <ClCompile Include="..\Src\CPU\68K\68K.cpp" />
<ClCompile Include="..\Src\CPU\68K\Musashi\m68kcpu.c" /> <ClCompile Include="..\Src\CPU\68K\Musashi\m68kcpu.c" />
<ClCompile Include="..\Src\CPU\68K\Musashi\m68kdasm.c"> <ClCompile Include="..\Src\CPU\68K\Musashi\m68kdasm.c">
@ -307,6 +306,7 @@ xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDi
<ClCompile Include="..\Src\Debugger\Register.cpp" /> <ClCompile Include="..\Src\Debugger\Register.cpp" />
<ClCompile Include="..\Src\Debugger\SupermodelDebugger.cpp" /> <ClCompile Include="..\Src\Debugger\SupermodelDebugger.cpp" />
<ClCompile Include="..\Src\Debugger\Watch.cpp" /> <ClCompile Include="..\Src\Debugger\Watch.cpp" />
<ClCompile Include="..\Src\GameLoader.cpp" />
<ClCompile Include="..\Src\Games.cpp" /> <ClCompile Include="..\Src\Games.cpp" />
<ClCompile Include="..\Src\Graphics\Legacy3D\Error.cpp" /> <ClCompile Include="..\Src\Graphics\Legacy3D\Error.cpp" />
<ClCompile Include="..\Src\Graphics\Legacy3D\Legacy3D.cpp" /> <ClCompile Include="..\Src\Graphics\Legacy3D\Legacy3D.cpp" />
@ -448,7 +448,10 @@ xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDi
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\Src\Util\ByteSwap.cpp" />
<ClCompile Include="..\Src\Util\ConfigBuilders.cpp" />
<ClCompile Include="..\Src\Util\Format.cpp" /> <ClCompile Include="..\Src\Util\Format.cpp" />
<ClCompile Include="..\Src\Util\NewConfig.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<MASM Include="..\Src\CPU\68K\Turbo68K\Turbo68K.asm"> <MASM Include="..\Src\CPU\68K\Turbo68K\Turbo68K.asm">
@ -501,7 +504,6 @@ xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDi
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\Src\BlockFile.h" /> <ClInclude Include="..\Src\BlockFile.h" />
<ClInclude Include="..\Src\Config.h" />
<ClInclude Include="..\Src\CPU\68K\68K.h" /> <ClInclude Include="..\Src\CPU\68K\68K.h" />
<ClInclude Include="..\Src\CPU\68K\Musashi\m68k.h" /> <ClInclude Include="..\Src\CPU\68K\Musashi\m68k.h" />
<ClInclude Include="..\Src\CPU\68K\Musashi\m68kconf.h" /> <ClInclude Include="..\Src\CPU\68K\Musashi\m68kconf.h" />
@ -531,6 +533,7 @@ xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDi
<ClInclude Include="..\Src\Debugger\Register.h" /> <ClInclude Include="..\Src\Debugger\Register.h" />
<ClInclude Include="..\Src\Debugger\SupermodelDebugger.h" /> <ClInclude Include="..\Src\Debugger\SupermodelDebugger.h" />
<ClInclude Include="..\Src\Debugger\Watch.h" /> <ClInclude Include="..\Src\Debugger\Watch.h" />
<ClInclude Include="..\Src\GameLoader.h" />
<ClInclude Include="..\Src\Games.h" /> <ClInclude Include="..\Src\Games.h" />
<ClInclude Include="..\Src\Graphics\IRender3D.h" /> <ClInclude Include="..\Src\Graphics\IRender3D.h" />
<ClInclude Include="..\Src\Graphics\Legacy3D\Legacy3D.h" /> <ClInclude Include="..\Src\Graphics\Legacy3D\Legacy3D.h" />
@ -609,7 +612,11 @@ xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDi
<ClInclude Include="..\Src\Sound\SCSPDSP.h" /> <ClInclude Include="..\Src\Sound\SCSPDSP.h" />
<ClInclude Include="..\Src\Supermodel.h" /> <ClInclude Include="..\Src\Supermodel.h" />
<ClInclude Include="..\Src\Util\BMPFile.h" /> <ClInclude Include="..\Src\Util\BMPFile.h" />
<ClInclude Include="..\Src\Util\ByteSwap.h" />
<ClInclude Include="..\Src\Util\ConfigBuilders.h" />
<ClInclude Include="..\Src\Util\Format.h" /> <ClInclude Include="..\Src\Util\Format.h" />
<ClInclude Include="..\Src\Util\GenericValue.h" />
<ClInclude Include="..\Src\Util\NewConfig.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

View file

@ -137,9 +137,6 @@
<ClCompile Include="..\Src\BlockFile.cpp"> <ClCompile Include="..\Src\BlockFile.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\Src\Config.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Src\Games.cpp"> <ClCompile Include="..\Src\Games.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -437,6 +434,18 @@
<ClCompile Include="..\Src\Graphics\New3D\R3DScrollFog.cpp"> <ClCompile Include="..\Src\Graphics\New3D\R3DScrollFog.cpp">
<Filter>Source Files\Graphics\New</Filter> <Filter>Source Files\Graphics\New</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\Src\Util\NewConfig.cpp">
<Filter>Source Files\Util</Filter>
</ClCompile>
<ClCompile Include="..\Src\Util\ConfigBuilders.cpp">
<Filter>Source Files\Util</Filter>
</ClCompile>
<ClCompile Include="..\Src\Util\ByteSwap.cpp">
<Filter>Source Files\Util</Filter>
</ClCompile>
<ClCompile Include="..\Src\GameLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<MASM Include="..\Src\CPU\68K\Turbo68K\Turbo68K.asm"> <MASM Include="..\Src\CPU\68K\Turbo68K\Turbo68K.asm">
@ -481,9 +490,6 @@
<ClInclude Include="..\Src\BlockFile.h"> <ClInclude Include="..\Src\BlockFile.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\Src\Config.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Src\Games.h"> <ClInclude Include="..\Src\Games.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -808,6 +814,21 @@
<ClInclude Include="..\Src\Graphics\New3D\R3DScrollFog.h"> <ClInclude Include="..\Src\Graphics\New3D\R3DScrollFog.h">
<Filter>Source Files\Graphics\New</Filter> <Filter>Source Files\Graphics\New</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\Src\Util\NewConfig.h">
<Filter>Header Files\Util</Filter>
</ClInclude>
<ClInclude Include="..\Src\Util\GenericValue.h">
<Filter>Header Files\Util</Filter>
</ClInclude>
<ClInclude Include="..\Src\Util\ByteSwap.h">
<Filter>Header Files\Util</Filter>
</ClInclude>
<ClInclude Include="..\Src\Util\ConfigBuilders.h">
<Filter>Header Files\Util</Filter>
</ClInclude>
<ClInclude Include="..\Src\GameLoader.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="..\Src\Debugger\ReadMe.txt"> <CustomBuild Include="..\Src\Debugger\ReadMe.txt">