Skip to content

Commit

Permalink
Werkkzeug3 builds with VS2010
Browse files Browse the repository at this point in the history
  • Loading branch information
@rygorous
rygorous committed Apr 15, 2012
1 parent 6efa461 commit 9be3418
Show file tree
Hide file tree
Showing 61 changed files with 5,080 additions and 70 deletions.
13 changes: 13 additions & 0 deletions werkkzeug3/.gitignore
View file
@@ -0,0 +1,13 @@
Debug/
Release/
Player\ Debug/
Player\ Release/
werkkzeug3/backup/
ipch/
*.suo
*.sln.old
*.sdf
*.opensdf
*vs.hpp
*ps.hpp
cubehorde_shader.?pp
11 changes: 11 additions & 0 deletions werkkzeug3/HOW_TO_BUILD.txt
View file
@@ -0,0 +1,11 @@
If you have VC 2010 installed and YASM in your path, you should be able to compile
Werkkzeug3 out of the box, albeit with some warnings.

As usual, there were some minor changes made to get it to compile with VS2010.
The player_mobile stuff was just removed from the solution - the mobile stuff was
for PDA targets running Windows CE, and compiled using Embedded VC6. Vile stuff.
Didn't seem worth the hassle, because *nobody* has the right build environment for
this anymore anyway.

A clean compile should be able to play back debris, if you find the right op to
view :).
6 changes: 3 additions & 3 deletions werkkzeug3/_start.cpp
View file
Expand Up @@ -14,6 +14,7 @@
#define WINVER 0x500 #define WINVER 0x500
#define _WIN32_WINNT 0x0500 #define _WIN32_WINNT 0x0500
#define DIRECTINPUT_VERSION 0x0800 #define DIRECTINPUT_VERSION 0x0800
#define DIRECTSOUND_VERSION 0x0800


#define sPLAYER_SCREENX 1024 #define sPLAYER_SCREENX 1024
#define sPLAYER_SCREENY 768 #define sPLAYER_SCREENY 768
Expand All @@ -29,6 +30,7 @@ const sChar *sWindowTitle="fr-052: platinum";
#endif #endif


#define D3D_DEBUG_INFO #define D3D_DEBUG_INFO
#define INITGUID // to get rid of dxguid.lib


#include <windows.h> #include <windows.h>
#include <d3d9.h> #include <d3d9.h>
Expand Down Expand Up @@ -64,9 +66,7 @@ const sChar *sWindowTitle="fr-052: platinum";
#pragma comment(lib,"winmm.lib") #pragma comment(lib,"winmm.lib")
#pragma comment(lib,"opengl32.lib") #pragma comment(lib,"opengl32.lib")
#pragma comment(lib,"dinput8.lib") #pragma comment(lib,"dinput8.lib")
#if !sINTRO || _DEBUG #if sINTRO && !defined(_DEBUG)
#pragma comment(lib,"dxguid.lib")
#else
#pragma comment(linker,"/nodefaultlib") #pragma comment(linker,"/nodefaultlib")
#endif #endif
#if !sPLAYER #if !sPLAYER
Expand Down
4 changes: 1 addition & 3 deletions werkkzeug3/_types.hpp
View file
Expand Up @@ -217,10 +217,8 @@ typedef signed char sS8; // for packed arrays
typedef short sS16; // for packed arrays typedef short sS16; // for packed arrays
typedef int sS32; // for packed arrays typedef int sS32; // for packed arrays
typedef signed __int64 sS64; // use as needed typedef signed __int64 sS64; // use as needed
#if !sMOBILE
typedef float sF32; // basic floatingpoint typedef float sF32; // basic floatingpoint
typedef double sF64; // use as needed typedef double sF64; // use as needed
#endif
typedef int sInt; // use this most! typedef int sInt; // use this most!
typedef int __w64 sDInt; // type for pointer diff typedef int __w64 sDInt; // type for pointer diff
#if sUNICODE #if sUNICODE
Expand Down Expand Up @@ -321,7 +319,7 @@ __forceinline sInt sCmpMem(const void *dd,const void *ss,sInt c) { return (sInt)
#if !sUNICODE #if !sUNICODE
__forceinline sInt sGetStringLen(const sChar *s) { return (sInt)strlen(s); } __forceinline sInt sGetStringLen(const sChar *s) { return (sInt)strlen(s); }
#else #else
__forceinline sInt sGetStringLen(const sChar *s) { for(sInt i=0;s[i];i++); return i; } __forceinline sInt sGetStringLen(const sChar *s) { sInt i;for(i=0;s[i];i++); return i; }
#endif #endif


/****************************************************************************/ /****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion werkkzeug3/_viruz2a.asm
View file
Expand Up @@ -5794,7 +5794,7 @@ _synthGetChannelVU@16:
ret 16 ret 16


global _synthGetMainVU@12 global _synthGetMainVU@12
_synthGetChannelVU@12: _synthGetMainVU@12:
pushad pushad
mov ebp, [esp + 36] mov ebp, [esp + 36]
mov esi, [esp + 40] mov esi, [esp + 40]
Expand Down
269 changes: 269 additions & 0 deletions werkkzeug3/base/base.vcxproj
View file

Large diffs are not rendered by default.

188 changes: 188 additions & 0 deletions werkkzeug3/base/base.vcxproj.filters
View file
@@ -0,0 +1,188 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="kkrunchy">
<UniqueIdentifier>{31434dcc-89a4-4e6e-877c-fdbd6bf33c75}</UniqueIdentifier>
</Filter>
<Filter Include="shaders">
<UniqueIdentifier>{affbf357-5948-4b9b-b1aa-2c0959d080af}</UniqueIdentifier>
</Filter>
<Filter Include="music">
<UniqueIdentifier>{e4a47d6e-259c-4f01-9880-dbb54d343167}</UniqueIdentifier>
</Filter>
<Filter Include="System">
<UniqueIdentifier>{4aba7801-ddfe-414f-bf75-0ae3eb6d0dcb}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\debuginfo.cpp">
<Filter>kkrunchy</Filter>
</ClCompile>
<ClCompile Include="..\depacker.cpp">
<Filter>kkrunchy</Filter>
</ClCompile>
<ClCompile Include="..\dis.cpp">
<Filter>kkrunchy</Filter>
</ClCompile>
<ClCompile Include="..\exepacker.cpp">
<Filter>kkrunchy</Filter>
</ClCompile>
<ClCompile Include="..\mapfile.cpp">
<Filter>kkrunchy</Filter>
</ClCompile>
<ClCompile Include="..\packer.cpp">
<Filter>kkrunchy</Filter>
</ClCompile>
<ClCompile Include="..\pdbfile.cpp">
<Filter>kkrunchy</Filter>
</ClCompile>
<ClCompile Include="..\shadercodegen.cpp">
<Filter>shaders</Filter>
</ClCompile>
<ClCompile Include="..\shadercompile.cpp">
<Filter>shaders</Filter>
</ClCompile>
<ClCompile Include="..\_mp3.cpp">
<Filter>music</Filter>
</ClCompile>
<ClCompile Include="..\_ogg.cpp">
<Filter>music</Filter>
</ClCompile>
<ClCompile Include="..\_viruz2.cpp">
<Filter>music</Filter>
</ClCompile>
<ClCompile Include="..\_ascbase.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="_bsplines.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="..\_diskitem.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="..\_gui.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="..\_intmath.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="..\_lekktor.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="..\_loader.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="_rygdxt.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="..\_start.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="..\_types.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="..\_util.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="..\_wavefront.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="..\_xsi.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="base_oplist.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\debuginfo.hpp">
<Filter>kkrunchy</Filter>
</ClInclude>
<ClInclude Include="..\depacker.hpp">
<Filter>kkrunchy</Filter>
</ClInclude>
<ClInclude Include="..\dis.hpp">
<Filter>kkrunchy</Filter>
</ClInclude>
<ClInclude Include="..\exepacker.hpp">
<Filter>kkrunchy</Filter>
</ClInclude>
<ClInclude Include="..\mapfile.hpp">
<Filter>kkrunchy</Filter>
</ClInclude>
<ClInclude Include="..\packer.hpp">
<Filter>kkrunchy</Filter>
</ClInclude>
<ClInclude Include="..\pdbfile.hpp">
<Filter>kkrunchy</Filter>
</ClInclude>
<ClInclude Include="..\shadercodegen.hpp">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shadercompile.hpp">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\_mp3.hpp">
<Filter>music</Filter>
</ClInclude>
<ClInclude Include="..\_ogg.hpp">
<Filter>music</Filter>
</ClInclude>
<ClInclude Include="..\_viruz2.hpp">
<Filter>music</Filter>
</ClInclude>
<ClInclude Include="..\_ascbase.hpp">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="_bsplines.hpp">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="..\_diskitem.hpp">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="..\_gui.hpp">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="..\_intmath.hpp">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="..\_lekktor.hpp">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="..\_loader.hpp">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="_rygdxt.hpp">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="..\_start.hpp">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="..\_startdx.hpp">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="..\_types.hpp">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="..\_util.hpp">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="..\_wavefront.hpp">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="..\_xsi.hpp">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="base_config.hpp" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\depack2.asm">
<Filter>kkrunchy</Filter>
</CustomBuild>
<CustomBuild Include="..\depacker.asm">
<Filter>kkrunchy</Filter>
</CustomBuild>
<CustomBuild Include="..\_viruz2a.asm">
<Filter>music</Filter>
</CustomBuild>
<CustomBuild Include="base_data.asm" />
</ItemGroup>
</Project>
3 changes: 3 additions & 0 deletions werkkzeug3/base/base.vcxproj.user
View file
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

0 comments on commit 9be3418

Please sign in to comment.