# HG changeset patch # User John Tsiombikas # Date 1446350668 -7200 # Node ID c37fe5d8a4ed03b9ec3a053f4805c8b1d9ce9ded # Parent 5ae5fd3626faf723302690e8d496f285b1fa0282 windows port diff -r 5ae5fd3626fa -r c37fe5d8a4ed RUN.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/RUN.bat Sun Nov 01 06:04:28 2015 +0200 @@ -0,0 +1,3 @@ +set PATH=lib;%PATH% + +bin\halloween-win32.exe %1 \ No newline at end of file diff -r 5ae5fd3626fa -r c37fe5d8a4ed dbf-halloween2015.sln --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dbf-halloween2015.sln Sun Nov 01 06:04:28 2015 +0200 @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbf-halloween2015", "dbf-halloween2015.vcxproj", "{9978AF1F-1313-48DF-BFF5-04DDBC5FC2FC}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9978AF1F-1313-48DF-BFF5-04DDBC5FC2FC}.Debug|Win32.ActiveCfg = Debug|Win32 + {9978AF1F-1313-48DF-BFF5-04DDBC5FC2FC}.Debug|Win32.Build.0 = Debug|Win32 + {9978AF1F-1313-48DF-BFF5-04DDBC5FC2FC}.Release|Win32.ActiveCfg = Release|Win32 + {9978AF1F-1313-48DF-BFF5-04DDBC5FC2FC}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff -r 5ae5fd3626fa -r c37fe5d8a4ed dbf-halloween2015.vcxproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dbf-halloween2015.vcxproj Sun Nov 01 06:04:28 2015 +0200 @@ -0,0 +1,337 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {9978AF1F-1313-48DF-BFF5-04DDBC5FC2FC} + Win32Proj + dbfhalloween2015 + + + + Application + true + v120 + MultiByte + + + Application + false + v120 + false + MultiByte + + + + + + + + + + + + + true + + + false + + + + + + Level3 + Disabled + WIN32;_USE_MATH_DEFINES;FREEGLUT_LIB_PRAGMAS=0;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + 4996;4244;4305 + $(SolutionDir)\src;$(SolutionDir)\libs;$(SolutionDir)\libs\vorbis;$(SolutionDir)\libs\imago;$(SolutionDir)\libs\libpng;%(AdditionalIncludeDirectories) + + + Console + true + opengl32.lib;freeglut.lib;glew32.lib;pthreadVC2.lib;OpenAL32.lib;glu32.lib;%(AdditionalDependencies) + false + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_USE_MATH_DEFINES;FREEGLUT_LIB_PRAGMAS=0;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + 4996;4244;4305 + $(SolutionDir)\src;$(SolutionDir)\libs;$(SolutionDir)\libs\vorbis;$(SolutionDir)\libs\imago;$(SolutionDir)\libs\libpng;%(AdditionalIncludeDirectories) + + + Console + true + true + true + opengl32.lib;freeglut.lib;glew32.lib;pthreadVC2.lib;OpenAL32.lib;glu32.lib;%(AdditionalDependencies) + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r 5ae5fd3626fa -r c37fe5d8a4ed dbf-halloween2015.vcxproj.filters --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dbf-halloween2015.vcxproj.filters Sun Nov 01 06:04:28 2015 +0200 @@ -0,0 +1,774 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;h;inl + + + {03081907-712a-4cce-b95d-49af87728e0b} + + + {ede333b5-81b8-4740-bdaa-c2f5ce11143b} + + + {b19aa330-e85c-41fc-81ac-896aa8d8c64f} + + + {6ec2fc9a-1fe8-49fe-a12a-265810253aff} + + + {bb2b36cc-13f3-4679-b5f4-b892a66be8af} + + + {e8e32764-c99f-487d-9eb2-5d7cd9943402} + + + {9247adb9-ef8c-43d0-b047-b6454814a1a6} + + + {02cb8c63-16a7-4eb0-ba30-e8b96f36074b} + + + {23f8afef-ec2a-494e-bd95-4591dd9617fc} + + + {4d038343-b93d-4c9b-a3c7-242ca8560111} + + + {0a281fef-4a74-48a9-b4c4-06f302f30abf} + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src\audio + + + src\audio + + + src\audio + + + src\dsys + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\imago2 + + + libs\imago2 + + + libs\imago2 + + + libs\imago2 + + + libs\imago2 + + + libs\imago2 + + + libs\imago2 + + + libs\imago2 + + + libs\imago2 + + + libs\libogg + + + libs\libogg + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + src + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src\audio + + + src\audio + + + src\audio + + + src\audio + + + src\dsys + + + src\dsys + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\jpeglib + + + libs\libpng + + + libs\libpng + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\imago2 + + + libs\imago2 + + + libs\libogg + + + libs\libogg + + + libs\libogg + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + libs\libvorbis + + + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + libs\vmath + + + \ No newline at end of file diff -r 5ae5fd3626fa -r c37fe5d8a4ed libs/imago/file_png.c --- a/libs/imago/file_png.c Sun Nov 01 00:51:36 2015 +0200 +++ b/libs/imago/file_png.c Sun Nov 01 06:04:28 2015 +0200 @@ -17,7 +17,7 @@ */ /* -- PNG module -- */ - +#include #include #include "png.h" #include "imago2.h" diff -r 5ae5fd3626fa -r c37fe5d8a4ed libs/vmath/vmath.h --- a/libs/vmath/vmath.h Sun Nov 01 00:51:36 2015 +0200 +++ b/libs/vmath/vmath.h Sun Nov 01 06:04:28 2015 +0200 @@ -48,7 +48,7 @@ #define MAX(a, b) ((a) > (b) ? (a) : (b)) #endif -#ifndef __GNUC__ +#if !defined(__GNUC__) && (!defined(_MSC_VER) || _MSC_VER < 1800) #define round(x) ((x) >= 0 ? (x) + 0.5 : (x) - 0.5) #endif diff -r 5ae5fd3626fa -r c37fe5d8a4ed src/image.cc --- a/src/image.cc Sun Nov 01 00:51:36 2015 +0200 +++ b/src/image.cc Sun Nov 01 06:04:28 2015 +0200 @@ -1,6 +1,10 @@ #include #include +#ifdef _MSC_VER +#include +#else #include +#endif #include "opengl.h" #include "image.h" #include "imago2.h" diff -r 5ae5fd3626fa -r c37fe5d8a4ed src/main.cc --- a/src/main.cc Sun Nov 01 00:51:36 2015 +0200 +++ b/src/main.cc Sun Nov 01 06:04:28 2015 +0200 @@ -2,6 +2,7 @@ #include #include #include +#include #include "opengl.h" #ifdef __APPLE__ #include diff -r 5ae5fd3626fa -r c37fe5d8a4ed src/opengl.c --- a/src/opengl.c Sun Nov 01 00:51:36 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -#include "opengl.h" - -struct GLCaps glcaps; - -int init_opengl() -{ - glewInit(); - - glcaps.shaders = GLEW_ARB_vertex_shader && GLEW_ARB_fragment_shader; - glcaps.fsaa = GLEW_ARB_multisample; - glcaps.sep_spec = GLEW_EXT_separate_specular_color; - glcaps.fbo = GLEW_ARB_framebuffer_object; - glcaps.shadow = GLEW_ARB_shadow | GLEW_SGIX_shadow; - - return 0; -} diff -r 5ae5fd3626fa -r c37fe5d8a4ed src/opengl.cc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/opengl.cc Sun Nov 01 06:04:28 2015 +0200 @@ -0,0 +1,16 @@ +#include "opengl.h" + +struct GLCaps glcaps; + +int init_opengl() +{ + glewInit(); + + glcaps.shaders = GLEW_ARB_vertex_shader && GLEW_ARB_fragment_shader; + glcaps.fsaa = GLEW_ARB_multisample; + glcaps.sep_spec = GLEW_EXT_separate_specular_color; + glcaps.fbo = GLEW_ARB_framebuffer_object; + glcaps.shadow = GLEW_ARB_shadow | GLEW_SGIX_shadow; + + return 0; +} diff -r 5ae5fd3626fa -r c37fe5d8a4ed src/opengl.h --- a/src/opengl.h Sun Nov 01 00:51:36 2015 +0200 +++ b/src/opengl.h Sun Nov 01 06:04:28 2015 +0200 @@ -10,16 +10,9 @@ int fbo; int shadow; }; + extern struct GLCaps glcaps; -#ifdef __cplusplus -extern "C" { -#endif - int init_opengl(); -#ifdef __cplusplus -} -#endif - #endif /* OPENGL_H_ */