Permalink
Browse files

Werkkzeug3 builds with VS2010

  • Loading branch information...
1 parent 6efa461 commit 9be341821084ee56b80906d9a8f2e67500cde13a @rygorous rygorous committed Apr 15, 2012
Showing with 5,080 additions and 70 deletions.
  1. +13 −0 werkkzeug3/.gitignore
  2. +11 −0 werkkzeug3/HOW_TO_BUILD.txt
  3. +3 −3 werkkzeug3/_start.cpp
  4. +1 −3 werkkzeug3/_types.hpp
  5. +1 −1 werkkzeug3/_viruz2a.asm
  6. +269 −0 werkkzeug3/base/base.vcxproj
  7. +188 −0 werkkzeug3/base/base.vcxproj.filters
  8. +3 −0 werkkzeug3/base/base.vcxproj.user
  9. +147 −0 werkkzeug3/base_console/base_console.vcxproj
  10. +45 −0 werkkzeug3/base_console/base_console.vcxproj.filters
  11. +3 −0 werkkzeug3/base_console/base_console.vcxproj.user
  12. +167 −0 werkkzeug3/example_cube/example_cube.vcxproj
  13. +3 −0 werkkzeug3/example_cube/example_cube.vcxproj.user
  14. +149 −0 werkkzeug3/fried/fried.vcxproj
  15. +40 −0 werkkzeug3/fried/fried.vcxproj.filters
  16. +3 −0 werkkzeug3/fried/fried.vcxproj.user
  17. +1 −3 werkkzeug3/materials/material11ps.hpp
  18. +1 −3 werkkzeug3/materials/material11vs.hpp
  19. +396 −0 werkkzeug3/materials/materials.vcxproj
  20. +3 −0 werkkzeug3/materials/materials.vcxproj.user
  21. +20 −0 werkkzeug3/nasm.props
  22. +1 −1 werkkzeug3/nasm.rules
  23. +82 −0 werkkzeug3/nasm.targets
  24. +134 −0 werkkzeug3/nasm.xml
  25. +291 −0 werkkzeug3/player_demo/player_demo.vcxproj
  26. +187 −0 werkkzeug3/player_demo/player_demo.vcxproj.filters
  27. +3 −0 werkkzeug3/player_demo/player_demo.vcxproj.user
  28. +1 −1 werkkzeug3/player_intro/introdata.asm
  29. +289 −0 werkkzeug3/player_intro/player_intro.vcxproj
  30. +168 −0 werkkzeug3/player_intro/player_intro.vcxproj.filters
  31. +3 −0 werkkzeug3/player_intro/player_intro.vcxproj.user
  32. +230 −0 werkkzeug3/player_kkrieger/player_kkrieger.vcxproj
  33. +128 −0 werkkzeug3/player_kkrieger/player_kkrieger.vcxproj.filters
  34. +3 −0 werkkzeug3/player_kkrieger/player_kkrieger.vcxproj.user
  35. +181 −0 werkkzeug3/player_mobile/player_mobile.vcxproj
  36. +3 −0 werkkzeug3/player_mobile/player_mobile.vcxproj.user
  37. +0 −1 werkkzeug3/player_mobile/player_mobile_config.hpp
  38. +3 −0 werkkzeug3/pngloader/loadpng.cpp
  39. +142 −0 werkkzeug3/pngloader/pngloader.vcxproj
  40. +24 −0 werkkzeug3/pngloader/pngloader.vcxproj.filters
  41. +3 −0 werkkzeug3/pngloader/pngloader.vcxproj.user
  42. +161 −0 werkkzeug3/shadercompile/shadercompile.vcxproj
  43. +3 −0 werkkzeug3/shadercompile/shadercompile.vcxproj.user
  44. +97 −0 werkkzeug3/texlibtest/texlibtest.vcxproj
  45. +14 −0 werkkzeug3/texlibtest/texlibtest.vcxproj.filters
  46. +3 −0 werkkzeug3/texlibtest/texlibtest.vcxproj.user
  47. +25 −0 werkkzeug3/tools/asc_wz3.props
  48. +87 −0 werkkzeug3/tools/asc_wz3.targets
  49. +163 −0 werkkzeug3/tools/asc_wz3.xml
  50. +98 −0 werkkzeug3/w3texlib/w3texlib.vcxproj
  51. +59 −0 werkkzeug3/w3texlib/w3texlib.vcxproj.filters
  52. +3 −0 werkkzeug3/w3texlib/w3texlib.vcxproj.user
  53. BIN werkkzeug3/werkkzeug3/werkkzeug.config
  54. +446 −0 werkkzeug3/werkkzeug3/werkkzeug3.vcxproj
  55. +238 −0 werkkzeug3/werkkzeug3/werkkzeug3.vcxproj.filters
  56. +3 −0 werkkzeug3/werkkzeug3/werkkzeug3.vcxproj.user
  57. +3 −4 werkkzeug3/werkkzeug3/wz3_data.asm
  58. +18 −50 werkkzeug3/wz3projects.sln
  59. +201 −0 werkkzeug3/wz_mobile/wz_mobile.vcxproj
  60. +112 −0 werkkzeug3/wz_mobile/wz_mobile.vcxproj.filters
  61. +3 −0 werkkzeug3/wz_mobile/wz_mobile.vcxproj.user
View
@@ -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
@@ -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 :).
View
@@ -14,6 +14,7 @@
#define WINVER 0x500
#define _WIN32_WINNT 0x0500
#define DIRECTINPUT_VERSION 0x0800
+#define DIRECTSOUND_VERSION 0x0800
#define sPLAYER_SCREENX 1024
#define sPLAYER_SCREENY 768
@@ -29,6 +30,7 @@ const sChar *sWindowTitle="fr-052: platinum";
#endif
#define D3D_DEBUG_INFO
+#define INITGUID // to get rid of dxguid.lib
#include <windows.h>
#include <d3d9.h>
@@ -64,9 +66,7 @@ const sChar *sWindowTitle="fr-052: platinum";
#pragma comment(lib,"winmm.lib")
#pragma comment(lib,"opengl32.lib")
#pragma comment(lib,"dinput8.lib")
-#if !sINTRO || _DEBUG
-#pragma comment(lib,"dxguid.lib")
-#else
+#if sINTRO && !defined(_DEBUG)
#pragma comment(linker,"/nodefaultlib")
#endif
#if !sPLAYER
View
@@ -217,10 +217,8 @@ typedef signed char sS8; // for packed arrays
typedef short sS16; // for packed arrays
typedef int sS32; // for packed arrays
typedef signed __int64 sS64; // use as needed
-#if !sMOBILE
typedef float sF32; // basic floatingpoint
typedef double sF64; // use as needed
-#endif
typedef int sInt; // use this most!
typedef int __w64 sDInt; // type for pointer diff
#if sUNICODE
@@ -321,7 +319,7 @@ __forceinline sInt sCmpMem(const void *dd,const void *ss,sInt c) { return (sInt)
#if !sUNICODE
__forceinline sInt sGetStringLen(const sChar *s) { return (sInt)strlen(s); }
#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
/****************************************************************************/
View
@@ -5794,7 +5794,7 @@ _synthGetChannelVU@16:
ret 16
global _synthGetMainVU@12
-_synthGetChannelVU@12:
+_synthGetMainVU@12:
pushad
mov ebp, [esp + 36]
mov esi, [esp + 40]

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -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>
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
Oops, something went wrong.

0 comments on commit 9be3418

Please sign in to comment.