From: John Tsiombikas Date: Tue, 20 Dec 2022 01:08:26 +0000 (+0200) Subject: VC project files X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=summerhack;a=commitdiff_plain;h=024e6f9e1a39a9617a737448b60b3ea95d513203 VC project files --- diff --git a/.gitignore b/.gitignore index c60fd20..9b31745 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,14 @@ *.so* sumhack-thelab data/ +*.suo +*.user +*.log +*.zip +*.tar.gz +Debug/ +Release/ +*.ncb +*.exe +*.dll +libs/SDL-1.2.15/ diff --git a/README.md b/README.md index f9adc92..2c9fb14 100644 --- a/README.md +++ b/README.md @@ -73,9 +73,23 @@ While on FreeBSD: sudo pkg install mesa-libs sdl gmake -### Windows +### Windows (MSVC) + +The sticking point with compiling on windows, especially with MSVC, is how to +handle dependencies. OpenGL is not an issue, but SDL must be installed and the +compiler/linker needs to be informed of its location. + +For new versions of MS Visual C++ (2015 or later), use vcpkg to install SDL 1.2. +It should work automatically. + +For older versions of MSVC, download the pre-compiled SDL 1.2 package: +https://libsdl.org/release/SDL-devel-1.2.15-VC.zip +and unzip it in the libs directory of summerhack (so that the directory +`libs\SDL-1.2.15` exists). + +Once SDL is taken care of, simply open the `summerhack.sln` project and hit F7 +(Build->Build Solution). -TODO ### MacOS X diff --git a/libs/jpeglib/jpeglib.vcproj b/libs/jpeglib/jpeglib.vcproj new file mode 100644 index 0000000..6f286df --- /dev/null +++ b/libs/jpeglib/jpeglib.vcproj @@ -0,0 +1,387 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/lib3ds/lib3ds.vcproj b/libs/lib3ds/lib3ds.vcproj new file mode 100644 index 0000000..85c8c50 --- /dev/null +++ b/libs/lib3ds/lib3ds.vcproj @@ -0,0 +1,317 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/libpng/libpng.vcproj b/libs/libpng/libpng.vcproj new file mode 100644 index 0000000..5d52e7d --- /dev/null +++ b/libs/libpng/libpng.vcproj @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/ogg/ogg.vcproj b/libs/ogg/ogg.vcproj new file mode 100644 index 0000000..cf8d2a3 --- /dev/null +++ b/libs/ogg/ogg.vcproj @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/vorbis/vorbis.vcproj b/libs/vorbis/vorbis.vcproj new file mode 100644 index 0000000..76df45c --- /dev/null +++ b/libs/vorbis/vorbis.vcproj @@ -0,0 +1,425 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/zlib/zlib.vcproj b/libs/zlib/zlib.vcproj new file mode 100644 index 0000000..f2188f2 --- /dev/null +++ b/libs/zlib/zlib.vcproj @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/3dengfx/3dengfx.vcproj b/src/3dengfx/3dengfx.vcproj new file mode 100644 index 0000000..5bade28 --- /dev/null +++ b/src/3dengfx/3dengfx.vcproj @@ -0,0 +1,739 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/3dengfx/src/3dengfx/ggen.cpp b/src/3dengfx/src/3dengfx/ggen.cpp index a920f75..de4ac56 100644 --- a/src/3dengfx/src/3dengfx/ggen.cpp +++ b/src/3dengfx/src/3dengfx/ggen.cpp @@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * John Tsiombikas 2005 */ +#include #include #include "3dengfx_config.h" #include "gfx/curves.hpp" diff --git a/src/3dengfx/src/common/types.h b/src/3dengfx/src/common/types.h index 8e39518..c710eda 100644 --- a/src/3dengfx/src/common/types.h +++ b/src/3dengfx/src/common/types.h @@ -41,6 +41,7 @@ typedef double scalar_t; #elif defined(unix) || defined(__unix__) #include #elif defined(_MSC_VER) +/* typedef __int8 int8_t; typedef unsigned __int8 uint8_t; typedef __int16 int16_t; @@ -49,6 +50,8 @@ typedef __int32 int32_t; typedef unsigned __int32 uint32_t; typedef __int64 int64_t; typedef unsigned __int64 uint64_t; +*/ +#include "sdl_config_win32.h" #else #error "unsupported platform, or detection failed" #endif /* stdint detection */ diff --git a/src/3dengfx/src/dsys/script.c b/src/3dengfx/src/dsys/script.c index c40daca..8a31c8f 100644 --- a/src/3dengfx/src/dsys/script.c +++ b/src/3dengfx/src/dsys/script.c @@ -174,7 +174,7 @@ void free_command(DemoCommand *cmd) { for(i=0; iargc; i++) { free((void*)cmd->argv[i]); } - free(cmd->argv); + free((void*)cmd->argv); } long str_to_time(const char *str) { diff --git a/summerhack.sln b/summerhack.sln new file mode 100644 index 0000000..e5c0fe1 --- /dev/null +++ b/summerhack.sln @@ -0,0 +1,82 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "summerhack", "summerhack.vcproj", "{9B68F95D-A5B8-48C8-AFA6-F461DE72B241}" + ProjectSection(ProjectDependencies) = postProject + {0CE8101D-AA14-4006-B415-684267FC00E2} = {0CE8101D-AA14-4006-B415-684267FC00E2} + {05D14878-E632-47FB-980B-402483260F10} = {05D14878-E632-47FB-980B-402483260F10} + {08C5FA87-467C-4892-981F-D606C2EDF5F7} = {08C5FA87-467C-4892-981F-D606C2EDF5F7} + {79223AD2-F498-4753-BD28-9027B99E9AB3} = {79223AD2-F498-4753-BD28-9027B99E9AB3} + {C10538FE-08C4-4504-A87A-2D3CD8B6A0F5} = {C10538FE-08C4-4504-A87A-2D3CD8B6A0F5} + {A62FFDA5-2D65-4DF9-92B7-6184C9CA56ED} = {A62FFDA5-2D65-4DF9-92B7-6184C9CA56ED} + {3AFA2843-C083-45F8-B0B6-C6E2075160C2} = {3AFA2843-C083-45F8-B0B6-C6E2075160C2} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3dengfx", "src\3dengfx\3dengfx.vcproj", "{05D14878-E632-47FB-980B-402483260F10}" + ProjectSection(ProjectDependencies) = postProject + {A62FFDA5-2D65-4DF9-92B7-6184C9CA56ED} = {A62FFDA5-2D65-4DF9-92B7-6184C9CA56ED} + {3AFA2843-C083-45F8-B0B6-C6E2075160C2} = {3AFA2843-C083-45F8-B0B6-C6E2075160C2} + {0CE8101D-AA14-4006-B415-684267FC00E2} = {0CE8101D-AA14-4006-B415-684267FC00E2} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib3ds", "libs\lib3ds\lib3ds.vcproj", "{3AFA2843-C083-45F8-B0B6-C6E2075160C2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "libs\zlib\zlib.vcproj", "{C10538FE-08C4-4504-A87A-2D3CD8B6A0F5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libs\libpng\libpng.vcproj", "{A62FFDA5-2D65-4DF9-92B7-6184C9CA56ED}" + ProjectSection(ProjectDependencies) = postProject + {C10538FE-08C4-4504-A87A-2D3CD8B6A0F5} = {C10538FE-08C4-4504-A87A-2D3CD8B6A0F5} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeglib", "libs\jpeglib\jpeglib.vcproj", "{0CE8101D-AA14-4006-B415-684267FC00E2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogg", "libs\ogg\ogg.vcproj", "{79223AD2-F498-4753-BD28-9027B99E9AB3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbis", "libs\vorbis\vorbis.vcproj", "{08C5FA87-467C-4892-981F-D606C2EDF5F7}" + ProjectSection(ProjectDependencies) = postProject + {79223AD2-F498-4753-BD28-9027B99E9AB3} = {79223AD2-F498-4753-BD28-9027B99E9AB3} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9B68F95D-A5B8-48C8-AFA6-F461DE72B241}.Debug|Win32.ActiveCfg = Debug|Win32 + {9B68F95D-A5B8-48C8-AFA6-F461DE72B241}.Debug|Win32.Build.0 = Debug|Win32 + {9B68F95D-A5B8-48C8-AFA6-F461DE72B241}.Release|Win32.ActiveCfg = Release|Win32 + {9B68F95D-A5B8-48C8-AFA6-F461DE72B241}.Release|Win32.Build.0 = Release|Win32 + {05D14878-E632-47FB-980B-402483260F10}.Debug|Win32.ActiveCfg = Debug|Win32 + {05D14878-E632-47FB-980B-402483260F10}.Debug|Win32.Build.0 = Debug|Win32 + {05D14878-E632-47FB-980B-402483260F10}.Release|Win32.ActiveCfg = Release|Win32 + {05D14878-E632-47FB-980B-402483260F10}.Release|Win32.Build.0 = Release|Win32 + {3AFA2843-C083-45F8-B0B6-C6E2075160C2}.Debug|Win32.ActiveCfg = Debug|Win32 + {3AFA2843-C083-45F8-B0B6-C6E2075160C2}.Debug|Win32.Build.0 = Debug|Win32 + {3AFA2843-C083-45F8-B0B6-C6E2075160C2}.Release|Win32.ActiveCfg = Release|Win32 + {3AFA2843-C083-45F8-B0B6-C6E2075160C2}.Release|Win32.Build.0 = Release|Win32 + {C10538FE-08C4-4504-A87A-2D3CD8B6A0F5}.Debug|Win32.ActiveCfg = Debug|Win32 + {C10538FE-08C4-4504-A87A-2D3CD8B6A0F5}.Debug|Win32.Build.0 = Debug|Win32 + {C10538FE-08C4-4504-A87A-2D3CD8B6A0F5}.Release|Win32.ActiveCfg = Release|Win32 + {C10538FE-08C4-4504-A87A-2D3CD8B6A0F5}.Release|Win32.Build.0 = Release|Win32 + {A62FFDA5-2D65-4DF9-92B7-6184C9CA56ED}.Debug|Win32.ActiveCfg = Debug|Win32 + {A62FFDA5-2D65-4DF9-92B7-6184C9CA56ED}.Debug|Win32.Build.0 = Debug|Win32 + {A62FFDA5-2D65-4DF9-92B7-6184C9CA56ED}.Release|Win32.ActiveCfg = Release|Win32 + {A62FFDA5-2D65-4DF9-92B7-6184C9CA56ED}.Release|Win32.Build.0 = Release|Win32 + {0CE8101D-AA14-4006-B415-684267FC00E2}.Debug|Win32.ActiveCfg = Debug|Win32 + {0CE8101D-AA14-4006-B415-684267FC00E2}.Debug|Win32.Build.0 = Debug|Win32 + {0CE8101D-AA14-4006-B415-684267FC00E2}.Release|Win32.ActiveCfg = Release|Win32 + {0CE8101D-AA14-4006-B415-684267FC00E2}.Release|Win32.Build.0 = Release|Win32 + {79223AD2-F498-4753-BD28-9027B99E9AB3}.Debug|Win32.ActiveCfg = Debug|Win32 + {79223AD2-F498-4753-BD28-9027B99E9AB3}.Debug|Win32.Build.0 = Debug|Win32 + {79223AD2-F498-4753-BD28-9027B99E9AB3}.Release|Win32.ActiveCfg = Release|Win32 + {79223AD2-F498-4753-BD28-9027B99E9AB3}.Release|Win32.Build.0 = Release|Win32 + {08C5FA87-467C-4892-981F-D606C2EDF5F7}.Debug|Win32.ActiveCfg = Debug|Win32 + {08C5FA87-467C-4892-981F-D606C2EDF5F7}.Debug|Win32.Build.0 = Debug|Win32 + {08C5FA87-467C-4892-981F-D606C2EDF5F7}.Release|Win32.ActiveCfg = Release|Win32 + {08C5FA87-467C-4892-981F-D606C2EDF5F7}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/summerhack.vcproj b/summerhack.vcproj new file mode 100644 index 0000000..8233003 --- /dev/null +++ b/summerhack.vcproj @@ -0,0 +1,255 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +