From fc9cb19ca4d831cc514e5c037cc0acb073603aed Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Mon, 1 Apr 2019 23:37:37 +0200 Subject: [PATCH] Remove irrelevant files Theas might lead to confusion on the end users part as they are specifik to Devilution and do not apply to DevilutionX --- Diablo.dsp | 718 ----------------------------------- Diablo.dsw | 61 --- Diablo.sln | 37 -- Diablo.vcxproj | 295 -------------- Diablo.vcxproj.filters | 467 ----------------------- Makefile | 55 --- MakefileVC | 85 ----- docs/INSTALL_linux.md | 49 --- docs/INSTALL_mac.md | 32 -- docs/INSTALL_windows.md | 46 --- docs/compatibility_matrix.md | 39 -- docs/troubleshooting.md | 23 -- format.sh | 19 - 13 files changed, 1926 deletions(-) delete mode 100644 Diablo.dsp delete mode 100644 Diablo.dsw delete mode 100644 Diablo.sln delete mode 100644 Diablo.vcxproj delete mode 100644 Diablo.vcxproj.filters delete mode 100644 Makefile delete mode 100644 MakefileVC delete mode 100755 docs/INSTALL_linux.md delete mode 100644 docs/INSTALL_mac.md delete mode 100644 docs/INSTALL_windows.md delete mode 100755 docs/compatibility_matrix.md delete mode 100644 docs/troubleshooting.md delete mode 100755 format.sh diff --git a/Diablo.dsp b/Diablo.dsp deleted file mode 100644 index 568d4f443..000000000 --- a/Diablo.dsp +++ /dev/null @@ -1,718 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Diablo" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Diablo - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Diablo.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Diablo.mak" CFG="Diablo - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Diablo - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Diablo - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE "Diablo - Win32 Release with PDB" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Diablo - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Source/WinRel" -# PROP BASE Intermediate_Dir "Source/WinRel" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "bld/WinRel" -# PROP Intermediate_Dir "Source/WinRel" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /TC /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 DiabloUI/WinRel/DiabloUI.lib 3rdParty/Storm/Source/WinRel/Storm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib version.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "Diablo - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Diablo__" -# PROP BASE Intermediate_Dir "Diablo__" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "bld/WinDebug" -# PROP Intermediate_Dir "Source/WinDebug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /O1 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /TC /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib user32.lib gdi32.lib advapi32.lib shell32.lib version.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib version.lib /nologo /subsystem:windows /machine:I386 - /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ELSEIF "$(CFG)" == "Diablo - Win32 Release with PDB" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Diablo___Win32_Release_with_PDB" -# PROP BASE Intermediate_Dir "Diablo___Win32_Release_with_PDB" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "bld/WinRel" -# PROP Intermediate_Dir "Source/WinRel" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# SUBTRACT BASE CPP /WX -# ADD CPP /nologo /MT /W3 /GX /Zi /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FAs /YX /FD /TC /c -# SUBTRACT CPP /WX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 DiabloUI/WinRel/DiabloUI.lib 3rdParty/Storm/Source/WinRel/Storm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib version.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 DiabloUI/WinRel/DiabloUI.lib 3rdParty/Storm/Source/WinRel/Storm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib version.lib /nologo /subsystem:windows /debug /machine:I386 - -!ENDIF - -# Begin Target - -# Name "Diablo - Win32 Release" -# Name "Diablo - Win32 Debug" -# Name "Diablo - Win32 Release with PDB" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Source\appfat.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\automap.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\capture.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\codec.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\control.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\cursor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\dead.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\debug.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\diablo.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\doom.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\drlg_l1.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\drlg_l2.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\drlg_l3.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\drlg_l4.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\dthread.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\dx.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\effects.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\encrypt.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\engine.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\error.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\fault.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\gamemenu.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\gendung.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\gmenu.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\help.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\init.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\interfac.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\inv.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\items.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\lighting.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\loadsave.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\logging.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\mainmenu.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\minitext.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\missiles.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\monster.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\movie.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\mpqapi.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\msg.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\msgcmd.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\multi.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\nthread.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\objects.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\pack.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\palette.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\path.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\pfile.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\player.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\plrmsg.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\portal.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\quests.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\restrict.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\scrollrt.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\setmaps.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\sha.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\sound.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\spells.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\stores.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\sync.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\textdat.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\themes.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\tmsg.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\town.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\towners.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\track.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\trigs.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\wave.cpp -# End Source File -# Begin Source File - -SOURCE=.\Source\render.cpp -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\Diablo.ico -# End Source File -# Begin Source File - -SOURCE=.\Diablo.rc -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" - -# Begin Source File - -SOURCE=.\defs.h -# End Source File -# Begin Source File - -SOURCE=.\enums.h -# End Source File -# Begin Source File - -SOURCE=.\structs.h -# End Source File -# Begin Source File - -SOURCE=.\types.h -# End Source File -# Begin Source File - -SOURCE=.\Source\appfat.h -# End Source File -# Begin Source File - -SOURCE=.\Source\automap.h -# End Source File -# Begin Source File - -SOURCE=.\Source\capture.h -# End Source File -# Begin Source File - -SOURCE=.\Source\codec.h -# End Source File -# Begin Source File - -SOURCE=.\Source\control.h -# End Source File -# Begin Source File - -SOURCE=.\Source\cursor.h -# End Source File -# Begin Source File - -SOURCE=.\Source\dead.h -# End Source File -# Begin Source File - -SOURCE=.\Source\debug.h -# End Source File -# Begin Source File - -SOURCE=.\Source\diablo.h -# End Source File -# Begin Source File - -SOURCE=.\Source\doom.h -# End Source File -# Begin Source File - -SOURCE=.\Source\drlg_l1.h -# End Source File -# Begin Source File - -SOURCE=.\Source\drlg_l2.h -# End Source File -# Begin Source File - -SOURCE=.\Source\drlg_l3.h -# End Source File -# Begin Source File - -SOURCE=.\Source\drlg_l4.h -# End Source File -# Begin Source File - -SOURCE=.\Source\dthread.h -# End Source File -# Begin Source File - -SOURCE=.\Source\dx.h -# End Source File -# Begin Source File - -SOURCE=.\Source\effects.h -# End Source File -# Begin Source File - -SOURCE=.\Source\encrypt.h -# End Source File -# Begin Source File - -SOURCE=.\Source\engine.h -# End Source File -# Begin Source File - -SOURCE=.\Source\error.h -# End Source File -# Begin Source File - -SOURCE=.\Source\fault.h -# End Source File -# Begin Source File - -SOURCE=.\Source\gamemenu.h -# End Source File -# Begin Source File - -SOURCE=.\Source\gendung.h -# End Source File -# Begin Source File - -SOURCE=.\Source\gmenu.h -# End Source File -# Begin Source File - -SOURCE=.\Source\help.h -# End Source File -# Begin Source File - -SOURCE=.\Source\init.h -# End Source File -# Begin Source File - -SOURCE=.\Source\interfac.h -# End Source File -# Begin Source File - -SOURCE=.\Source\inv.h -# End Source File -# Begin Source File - -SOURCE=.\Source\items.h -# End Source File -# Begin Source File - -SOURCE=.\Source\lighting.h -# End Source File -# Begin Source File - -SOURCE=.\Source\loadsave.h -# End Source File -# Begin Source File - -SOURCE=.\Source\logging.h -# End Source File -# Begin Source File - -SOURCE=.\Source\mainmenu.h -# End Source File -# Begin Source File - -SOURCE=.\Source\minitext.h -# End Source File -# Begin Source File - -SOURCE=.\Source\missiles.h -# End Source File -# Begin Source File - -SOURCE=.\Source\monster.h -# End Source File -# Begin Source File - -SOURCE=.\Source\movie.h -# End Source File -# Begin Source File - -SOURCE=.\Source\mpqapi.h -# End Source File -# Begin Source File - -SOURCE=.\Source\msg.h -# End Source File -# Begin Source File - -SOURCE=.\Source\msgcmd.h -# End Source File -# Begin Source File - -SOURCE=.\Source\multi.h -# End Source File -# Begin Source File - -SOURCE=.\Source\nthread.h -# End Source File -# Begin Source File - -SOURCE=.\Source\objects.h -# End Source File -# Begin Source File - -SOURCE=.\Source\pack.h -# End Source File -# Begin Source File - -SOURCE=.\Source\palette.h -# End Source File -# Begin Source File - -SOURCE=.\Source\path.h -# End Source File -# Begin Source File - -SOURCE=.\Source\pfile.h -# End Source File -# Begin Source File - -SOURCE=.\Source\player.h -# End Source File -# Begin Source File - -SOURCE=.\Source\plrmsg.h -# End Source File -# Begin Source File - -SOURCE=.\Source\portal.h -# End Source File -# Begin Source File - -SOURCE=.\Source\quests.h -# End Source File -# Begin Source File - -SOURCE=.\Source\render.h -# End Source File -# Begin Source File - -SOURCE=.\Source\restrict.h -# End Source File -# Begin Source File - -SOURCE=.\Source\scrollrt.h -# End Source File -# Begin Source File - -SOURCE=.\Source\setmaps.h -# End Source File -# Begin Source File - -SOURCE=.\Source\sha.h -# End Source File -# Begin Source File - -SOURCE=.\Source\sound.h -# End Source File -# Begin Source File - -SOURCE=.\Source\spells.h -# End Source File -# Begin Source File - -SOURCE=.\Source\stores.h -# End Source File -# Begin Source File - -SOURCE=.\Source\sync.h -# End Source File -# Begin Source File - -SOURCE=.\Source\textdat.h -# End Source File -# Begin Source File - -SOURCE=.\Source\themes.h -# End Source File -# Begin Source File - -SOURCE=.\Source\tmsg.h -# End Source File -# Begin Source File - -SOURCE=.\Source\town.h -# End Source File -# Begin Source File - -SOURCE=.\Source\towners.h -# End Source File -# Begin Source File - -SOURCE=.\Source\track.h -# End Source File -# Begin Source File - -SOURCE=.\Source\trigs.h -# End Source File -# Begin Source File - -SOURCE=.\Source\wave.h -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# End Group -# Begin Group "PKWare" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\3rdParty\PKWare\explode.cpp -# End Source File -# Begin Source File - -SOURCE=.\3rdParty\PKWare\implode.cpp -# End Source File -# End Group -# End Target -# End Project \ No newline at end of file diff --git a/Diablo.dsw b/Diablo.dsw deleted file mode 100644 index ceb70a2ea..000000000 --- a/Diablo.dsw +++ /dev/null @@ -1,61 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "Diablo"=".\Diablo.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name DiabloUI - End Project Dependency - Begin Project Dependency - Project_Dep_Name Storm - End Project Dependency -}}} - -############################################################################### - -Project: "DiabloUI"=".\DiabloUI\DiabloUI.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Storm - End Project Dependency -}}} - -############################################################################### - -Project: "Storm"=".\3rdParty\Storm\Source\Storm.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### diff --git a/Diablo.sln b/Diablo.sln deleted file mode 100644 index 72ba556b8..000000000 --- a/Diablo.sln +++ /dev/null @@ -1,37 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27703.2035 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Diablo", "Diablo.vcxproj", "{23114A83-7D81-4F17-A6B8-2FC51F3D72F2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiabloUI", "DiabloUI\DiabloUI.vcxproj", "{8408E35E-3CF5-4D4E-B873-AF3952CDABD4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Storm", "3rdParty\Storm\Source\Storm.vcxproj", "{B28F69CE-15A1-424D-BBB5-2727258D675B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x86 = Debug|x86 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {23114A83-7D81-4F17-A6B8-2FC51F3D72F2}.Debug|x86.ActiveCfg = Debug|Win32 - {23114A83-7D81-4F17-A6B8-2FC51F3D72F2}.Debug|x86.Build.0 = Debug|Win32 - {23114A83-7D81-4F17-A6B8-2FC51F3D72F2}.Release|x86.ActiveCfg = Release|Win32 - {23114A83-7D81-4F17-A6B8-2FC51F3D72F2}.Release|x86.Build.0 = Release|Win32 - {8408E35E-3CF5-4D4E-B873-AF3952CDABD4}.Debug|x86.ActiveCfg = Debug|Win32 - {8408E35E-3CF5-4D4E-B873-AF3952CDABD4}.Debug|x86.Build.0 = Debug|Win32 - {8408E35E-3CF5-4D4E-B873-AF3952CDABD4}.Release|x86.ActiveCfg = Release|Win32 - {8408E35E-3CF5-4D4E-B873-AF3952CDABD4}.Release|x86.Build.0 = Release|Win32 - {B28F69CE-15A1-424D-BBB5-2727258D675B}.Debug|x86.ActiveCfg = Debug|Win32 - {B28F69CE-15A1-424D-BBB5-2727258D675B}.Debug|x86.Build.0 = Debug|Win32 - {B28F69CE-15A1-424D-BBB5-2727258D675B}.Release|x86.ActiveCfg = Release|Win32 - {B28F69CE-15A1-424D-BBB5-2727258D675B}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {6252549D-BED6-405B-9D6D-42C9074D0684} - EndGlobalSection -EndGlobal diff --git a/Diablo.vcxproj b/Diablo.vcxproj deleted file mode 100644 index ca8fad868..000000000 --- a/Diablo.vcxproj +++ /dev/null @@ -1,295 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - - {23114A83-7D81-4F17-A6B8-2FC51F3D72F2} - 8.1 - - - - Application - v141 - - - Application - v141 - - - - - - - - - - - - - - - .\Source/WinRel\ - .\Source/WinRel\ - - - .\Source/WinDebug\ - .\Source/WinDebug\ - - - - MultiThreaded - Default - true - MaxSpeed - true - Level3 - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - .\Source/WinRel\ - .\Source/WinRel\ - .\Source/WinRel\ - 4996 - true - true - None - - - true - NDEBUG;%(PreprocessorDefinitions) - .\Source/WinRel\Diablo.tlb - true - NUL - Win32 - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - - - .\Source/WinRel\Diablo.bsc - - - Windows - .\Source/WinRel\Diablo.exe - DiabloUI/WinRel/DiabloUI.lib;3rdParty/Storm/Source/WinRel/Storm.lib;version.lib;%(AdditionalDependencies) - false - false - false - - - - - MultiThreadedDebug - OnlyExplicitInline - Disabled - true - Level3 - EditAndContinue - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - .\Source/WinDebug\ - .\Source/WinDebug\ - .\Source/WinDebug\ - 4996 - true - - - true - _DEBUG;%(PreprocessorDefinitions) - .\Source/WinDebug\Diablo.tlb - true - NUL - Win32 - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - - - .\Source/WinDebug\Diablo.bsc - - - true - Windows - .\Source/WinDebug\Diablo.exe - DiabloUI/WinDebug/DiabloUI.lib;3rdParty/Storm/Source/WinDebug/Storm.lib;version.lib;%(AdditionalDependencies) - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {b28f69ce-15a1-424d-bbb5-2727258d675b} - false - - - {8408e35e-3cf5-4d4e-b873-af3952cdabd4} - false - - - - - - diff --git a/Diablo.vcxproj.filters b/Diablo.vcxproj.filters deleted file mode 100644 index 5fb895af3..000000000 --- a/Diablo.vcxproj.filters +++ /dev/null @@ -1,467 +0,0 @@ - - - - - {0fb229f0-d459-4ec9-b897-317b016e0a57} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {52f34be1-947a-42ee-b303-4a46566a14a7} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - {8003aed2-27a6-444b-8fb0-bb8a59530005} - h;hpp;hxx;hm;inl - - - {5dbacde9-4fc8-4776-ba59-92912e0c8ab5} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - PKWare - - - PKWare - - - - - Resource Files - - - - - Resource Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - PKWare - - - diff --git a/Makefile b/Makefile deleted file mode 100644 index fee594b36..000000000 --- a/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# mingw32 and mingw64 have different executables -ifdef MINGW32 - CXX=mingw32-g++ - DLLTOOL=dlltool - WINDRES=windres -else - CXX=i686-w64-mingw32-g++ - DLLTOOL=i686-w64-mingw32-dlltool - WINDRES=i686-w64-mingw32-windres -endif - -# Clang doesn't understand permissive compilation, we need to "fix" invalid -# casts from a pointer type there using -# static_cast(reinterpret_cast(ptr)) -# instead of -# (NEW_TYPE)(ptr) -CXXFLAGS=-fpermissive -Wno-write-strings -CPPFLAGS=-MMD -MF $*.d -LDLIBS=-lgdi32 -lversion -ldiabloui -lstorm -LDFLAGS=-L./ -static-libgcc -mwindows - -all: devilution.exe - -debug: CXXFLAGS += -D_DEBUG -debug: CPPFLAGS += -D_DEBUG -debug: devilution.exe - -DIABLO_SRC=$(sort $(filter-out Source/_asm.cpp Source/_render.cpp, $(wildcard Source/*.cpp))) -OBJS=$(DIABLO_SRC:.cpp=.o) - -PKWARE_SRC=$(wildcard 3rdParty/PKWare/*.cpp) -PKWARE_OBJS=$(PKWARE_SRC:.cpp=.o) - -devilution.exe: $(OBJS) $(PKWARE_OBJS) diabres.o diabloui.lib storm.lib - $(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS) - -diabres.o: Diablo.rc - $(WINDRES) $< $@ - -diabloui.lib: diabloui.dll DiabloUI/diabloui_gcc.def - $(DLLTOOL) -d DiabloUI/diabloui_gcc.def -D $< -l $@ - -diabloui.dll: -# $(error Please copy diabloui.dll (version 1.09[b]) here) - -storm.lib: storm.dll 3rdParty/Storm/Source/storm_gcc.def - $(DLLTOOL) -d 3rdParty/Storm/Source/storm_gcc.def -D $< -l $@ - -storm.dll: -# $(error Please copy storm.dll (version 1.09[b]) here) - -clean: - @$(RM) -v $(OBJS) $(OBJS:.o=.d) $(PKWARE_OBJS) $(PKWARE_OBJS:.o=d) diabres.o storm.lib diabloui.lib devilution.exe - -.PHONY: clean all diff --git a/MakefileVC b/MakefileVC deleted file mode 100644 index eb1a64f93..000000000 --- a/MakefileVC +++ /dev/null @@ -1,85 +0,0 @@ -VC5_DIR ?= $(HOME)/DevStudio_5.10/VC - -# The $(VS6_DIR) directory is a copy of the "Microsoft Visual Studio" directory. -# -# To get a working setup on Linux or other "portable" copies of VS, -# the following DLLs have to be copied to the -# $(VS6_DIR)/VC98/Bin directory. -# -# - $(VS6_DIR)/Common/MSDev98/Bin/MSPDB60.DLL -# -# And to the $(VC5_DIR)/bin directory. -# -# - $(VC5_DIR)/SharedIDE/bin/MSDIS100.DLL -# - $(VC5_DIR)/SharedIDE/bin/MSPDB50.DLL -VS6_DIR ?= $(HOME)/VS6 - -VC6_DIR = $(VS6_DIR)/VC98 - -VC6_BIN_DIR = $(VC6_DIR)/Bin -VC6_INC_DIR = $(VC6_DIR)/Include -VC6_LIB_DIR = $(VC6_DIR)/Lib - -VC5_LIB_DIR = $(VC5_DIR)/lib - -IDE_DIR ?= $(VS6_DIR)/Common/MSDev98 -IDE_BIN_DIR = $(IDE_DIR)/bin -ifeq ($(OS),Windows_NT) - CL = $(VC6_BIN_DIR)/CL.EXE - RC = $(IDE_BIN_DIR)/RC.EXE - VC5_LINK = $(VC5_DIR)/bin/link.exe - VC6_LINK = $(VC6_BIN_DIR)/link.exe -else - CL = wine $(VC6_BIN_DIR)/CL.EXE - RC = wine $(IDE_BIN_DIR)/RC.EXE - VC5_LINK = wine $(VC5_DIR)/bin/link.exe - VC6_LINK = wine $(VC6_BIN_DIR)/link.exe -endif - -CFLAGS=/nologo /c /TC /GX /W3 /O1 /I $(VC6_INC_DIR) /FD /MT /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fp"Diablo.pch" /YX /Gm /Zi /FAs -LINKFLAGS=/nologo /subsystem:windows /machine:I386 /incremental:no - -ifeq ($(MAKE_BUILD),pdb) - VC_LINK = $(VC6_LINK) - LINKFLAGS += /pdb:"Diablo.pdb" /LIBPATH:$(VC6_LIB_DIR) /debug -else - VC_LINK=$(VC5_LINK) - LINKFLAGS+= /LIBPATH:$(VC5_LIB_DIR) -endif - -all: Diablo.exe - -debug: CFLAGS += /D "_DEBUG" -debug: Diablo.exe - -# fix compilation order to match the VC6 workspace files and exclude local assembly functions -DIABLO_SRC=$(sort $(filter-out Source/_asm.cpp Source/_render.cpp Source/render.cpp, $(wildcard Source/*.cpp))) -DIABLO_SRC += Source/render.cpp -OBJS=$(DIABLO_SRC:.cpp=.obj) - -PKWARE_SRC=$(sort $(wildcard 3rdParty/PKWare/*.cpp)) -PKWARE_OBJS=$(PKWARE_SRC:.cpp=.obj) - -Diablo.exe: main_files $(PKWARE_OBJS) diablo.res DiabloUI/diabloui.lib 3rdParty/Storm/storm.lib - $(VC_LINK) /OUT:$@ $(LINKFLAGS) $(OBJS) $(PKWARE_OBJS) diablo.res DiabloUI/diabloui.lib 3rdParty/Storm/storm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib version.lib - -DiabloUI/diabloui.lib: - make -C DiabloUI - -3rdParty/Storm/storm.lib: - make -C 3rdParty/Storm - -# compiles all main source files with once compiler call -main_files: - $(CL) $(CFLAGS) /FoSource/ $(DIABLO_SRC) - -%.obj: %.cpp - $(CL) $(CFLAGS) /Fo$@ $< - -diablo.res: Diablo.rc - $(RC) /i $(VC6_INC_DIR) /i $(VC6_DIR)/MFC/Include /l 0x409 /fo $@ $< - -clean: - @$(RM) -v $(OBJS) $(PKWARE_OBJS) - -.PHONY: clean all diff --git a/docs/INSTALL_linux.md b/docs/INSTALL_linux.md deleted file mode 100755 index efbdcd681..000000000 --- a/docs/INSTALL_linux.md +++ /dev/null @@ -1,49 +0,0 @@ -# Installation - -## Dependencies - -Ubuntu -```bash -sudo apt install g++-mingw-w64-i686 -``` - -Arch Linux -```bash -pacman -S mingw-w64-gcc mingw-w64-binutils -``` - -Fedora 28: -```bash -sudo dnf install mingw32-gcc-c++ wine -``` - -elementary OS: -```bash -sudo apt install mingw-w64 wine -``` - - -## Building - -```bash -git clone https://github.com/galaxyhaxz/devilution -cd devilution -cp /path/to/diablo_game_dir/diabloui.dll . -cp /path/to/diablo_game_dir/storm.dll . -make -``` - -On a 32-bit host, `$ make MINGW32=mingw32` should be used, to specify the 32-bit -toolchain. - -## Install - -```bash -cp devilution.exe /path/to/diablo_game_dir/ -``` - -## Run - -```bash -wine devilution.exe -``` diff --git a/docs/INSTALL_mac.md b/docs/INSTALL_mac.md deleted file mode 100644 index ef2d34d2d..000000000 --- a/docs/INSTALL_mac.md +++ /dev/null @@ -1,32 +0,0 @@ -# Installation - -## Dependencies - -[Homebrew](https://brew.sh/) - -```bash -brew install wine -brew install mingw-w64 -``` - -## Building - -```bash -git clone https://github.com/galaxyhaxz/devilution -cd devilution -cp /path/to/diablo_game_dir/diabloui.dll . -cp /path/to/diablo_game_dir/Storm.dll . -make -``` - -## Install - -```bash -cp devilution.exe /path/to/diablo_game_dir/ -``` - -## Run - -```bash -wine devilution.exe -``` diff --git a/docs/INSTALL_windows.md b/docs/INSTALL_windows.md deleted file mode 100644 index 8b4fea962..000000000 --- a/docs/INSTALL_windows.md +++ /dev/null @@ -1,46 +0,0 @@ -# Installation - -## Dependencies and Initial Environment Configuration - -* Install [MSYS2](https://www.msys2.org/) - -```bash -# Start the *MSYS2 MinGW 32-bit* terminal. - -# If this is the first time, go ahead and update all of your components, and -# follow and instructions about restarting the terminal and running the update again: -pacman -Syu - -# After everything is updated, let's download all of the components needed -# to build it and set up any dependency symlinks: -pacman -Sy git make mingw-w64-i686-gcc mingw-w64-i686-binutils - -ln -s /mingw32/i686-w64-mingw32/bin/dlltool.exe /usr/bin/i686-w64-mingw32-dlltool.exe -ln -s /mingw32/i686-w64-mingw32/bin/as.exe /usr/bin/i686-w64-mingw32-as.exe -ln -s /mingw32/bin/windres.exe /usr/bin/i686-w64-mingw32-windres.exe -``` - -## Building - -```bash -git clone https://github.com/galaxyhaxz/devilution -cd devilution -cp /path/to/diablo_game_dir/diabloui.dll . -cp /path/to/diablo_game_dir/storm.dll . - -# If you only have a single core machine or if building in parallel -# causes issues, simply run the following command: -make - -# If you want to compile faster, then use the following command (Substitute # for -# your number of processors + 1. So if you have an 8 core processor, use 9: -make -j# -``` - -## Install - -```bash -# The Devilution executable will be placed in the root of your Devilution repository. -# Simply copy this over to your Diablo installation folder: -cp devilution.exe /path/to/diablo_game_dir/ -``` \ No newline at end of file diff --git a/docs/compatibility_matrix.md b/docs/compatibility_matrix.md deleted file mode 100755 index de415c065..000000000 --- a/docs/compatibility_matrix.md +++ /dev/null @@ -1,39 +0,0 @@ -# Compatibility Matrix, Compilations, Platform Statuses, Etc - -Please use UTC times for all entries. The Z ending represents UTC time. - -## Status Cheat Sheet - -[Modeled after Wine HQ's Rating System](https://wiki.winehq.org/AppDB_Rating_Definitions) - -| Rank | Description | -| --- | --- | -| Platinum | Works perfectly right after compilation either better or equal to Native Diablo Executable. | -| Gold | Works right after compilation with no crashes during gameplay but workarounds needed. | -| Silver | Works right after compilation with no crashes during gameplay but issues exist where no workarounds exist. | -| Bronze | Mostly works but there are still some problems remaining that prevent a full playthrough.| -| Trash | Game has severe problems and cannot be played. | - -## Windows - -| Date | Status | OS | Bitness | Version (OS) | Build (OS) | Compiler | Build Platform | User | Workaround | -| --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | -| 2018-06-24 @ 17:05 Z| Gold | 10 | x64 | 1803 | 17134.112 | i686-w64-mingw32-gcc-7.3.0 | MSYS 2 i686 | fearedbliss | Needed to use ddraw patch. | -| 2018-06-24 @ 12:52 Z| Platinum | 7 | x64 | 6.1 | 7601 | Visual C++ 6.0 | VC++ | Sergi4UA | None | -| 2018-06-24 @ 01:00 Z| Platinum | 7 | x64 | 6.1 | 7601 | Visual C++ 5.10 | VC++ | galaxyhaxz | None | -| 2018-06-24 @ 18:00 Z| Gold | 10 | x64 | 1803 | 17134.112 | Visual Studio 2017 (Community) | VC++ | MadHed | Disable DEP in linker options | -| 2018-06-24 @ 16:00 Z| Gold | 7 | x64 | 6.1 | 7601 | Visual Studio 2017 (Community) | VC++ | StephenCWills | Disable DEP in linker options | -| 2018-06-26 @ 19:30 Z| Platinum | 7 | x64 | 6.1 | 7601 | i686-w64-mingw32-g++ (GCC) 6.4.0 | Cygwin | StephenCWills | None | -| 2018-07-05 @ 23:54 Z| Gold | 10 | x64 | 1803 | 17134.112 | Visual Studio 2017 (Community) | VC++ | fearedbliss | Disable DEP in linker options | - -## Linux - -| Date | Status | OS | Bitness | Version (OS) | Build (OS) | Compiler | Build Platform | User | Workaround | -| --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | -| 2018-08-20 @ 12:05 Z| Gold | Ubuntu (WSL) | x64 | xenial | 16.04.4 LTS | i686-w64-mingw32-g++ (GCC) 5.3.1 20160211 | Mingw64-x86 | ChaosMarc | Needed to use ddraw patch. | -| 2018-08-20 @ 12:05 Z| Trash | Ubuntu (WSL) | x64 | bionic | 18.04 LTS | i686-w64-mingw32-g++ (GCC) 7.3-win32 20180312 | Mingw64-x86 | ChaosMarc | Crashes on startup (#107) | - -## Mac OS X - -| Date | Status | OS | Bitness | Version (OS) | Build (OS) | Compiler | Build Platform | User | Workaround | -| --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md deleted file mode 100644 index 3231ec527..000000000 --- a/docs/troubleshooting.md +++ /dev/null @@ -1,23 +0,0 @@ -# Troubleshooting - -While Devilution should produce a binary close to the original (compatible with Windows 95/NT), it may cause issues on newer systems. It has been reported to frequently crash on some setups, although for many it appears to be running flawless otherwise. Windows 7, Linux-WINE, and Windows 10 have all reported success. - -Note that newer compilers may need to be tweaked to properly produce an executable. Currently this is being worked on to provide multiple Makefiles for a variety of systems. To ensure the best results, either MinGW or Visual Studio 2003/older should be used for the time being. - -## Compilations with Different Toolchains -Compiling with different compilers (Visual C++, MinGW, Etc) will lead lead to different -results with how the executable interacts with the operating system, and may lead to either -weird crashes or different types of problems either during startup or runtime. - -For example, for fearedbliss, on his Windows 10 x64 machine where he compiled Devilution -with MSYS2/MinGW32, he was getting the following messages: - -![Screenshot 1: Windows 2000 Advisory](https://i.imgur.com/ScFLGu5.png) - -![Screenshot 2: DirectDraw Error ](https://i.imgur.com/kiWkBuk.png) - -For the first issue, it is annoying but doesn't seem to stop you from playing the game. - -The second issue simply requires you to use the DirectDraw patch (ddraw.dll). Once the -dll is placed in your Diablo directory, and all of it's dependencies are installed -(DirectX 9 Runtime, and VC++ 2010 x86 Redistributable), it will work. \ No newline at end of file diff --git a/format.sh b/format.sh deleted file mode 100755 index 8c5a8e365..000000000 --- a/format.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -ROOT=`pwd` - -CPP_DONE="doom.cpp movie.cpp pfile.cpp player.cpp plrmsg.cpp sound.cpp spells.cpp tmsg.cpp" - -cd ${ROOT}/Source -for f in $CPP_DONE; do - echo "Formatting $f" - clang-format -style=file -i $f -done - -H_DONE="enums.h structs.h" - -cd ${ROOT} -for f in $H_DONE; do - echo "Formatting $f" - clang-format -style=file -i $f -done