From ed517f250fefb7b638079a67d14bd4faa6cf28a6 Mon Sep 17 00:00:00 2001 From: Nemo Date: Sat, 6 Jun 2020 13:00:19 +0200 Subject: [PATCH] -struct alignment fix (both dll's now loadable by the game) and some cleanup -added redalert project back into sln --- .gitignore | 2 + CnCRemastered.sln | 6 + REDALERT/RedAlert.vcxproj | 56 +- TIBERIANDAWN/TiberianDawn.vcxproj | 11 +- TiberianDawn/TiberianDawn.vcxproj.filters | 1235 +++++++++++++++++++++ 5 files changed, 1253 insertions(+), 57 deletions(-) create mode 100644 TiberianDawn/TiberianDawn.vcxproj.filters diff --git a/.gitignore b/.gitignore index 292be43..697a85a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /bin/Win32 /TIBERIANDAWN/TiberianDawn.vcxproj.user /TIBERIANDAWN/Win32/Debug +/REDALERT/Win32 +/REDALERT/RedAlert.vcxproj.user diff --git a/CnCRemastered.sln b/CnCRemastered.sln index db91b1a..30d5593 100644 --- a/CnCRemastered.sln +++ b/CnCRemastered.sln @@ -4,6 +4,8 @@ VisualStudioVersion = 16.0.30128.74 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TiberianDawn", "TiberianDawn\TiberianDawn.vcxproj", "{1380ED08-82A3-49C2-A171-1915574B3382}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RedAlert", "REDALERT\RedAlert.vcxproj", "{DA948ED9-EF67-4813-94B7-995BE956786E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x86 = Debug|x86 @@ -14,6 +16,10 @@ Global {1380ED08-82A3-49C2-A171-1915574B3382}.Debug|x86.Build.0 = Debug|Win32 {1380ED08-82A3-49C2-A171-1915574B3382}.Release|x86.ActiveCfg = Release|Win32 {1380ED08-82A3-49C2-A171-1915574B3382}.Release|x86.Build.0 = Release|Win32 + {DA948ED9-EF67-4813-94B7-995BE956786E}.Debug|x86.ActiveCfg = Debug|Win32 + {DA948ED9-EF67-4813-94B7-995BE956786E}.Debug|x86.Build.0 = Debug|Win32 + {DA948ED9-EF67-4813-94B7-995BE956786E}.Release|x86.ActiveCfg = Release|Win32 + {DA948ED9-EF67-4813-94B7-995BE956786E}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/REDALERT/RedAlert.vcxproj b/REDALERT/RedAlert.vcxproj index 1a65d28..fae457b 100644 --- a/REDALERT/RedAlert.vcxproj +++ b/REDALERT/RedAlert.vcxproj @@ -9,14 +9,6 @@ Release Win32 - - Debug - x64 - - - Release - x64 - 15.0 @@ -42,19 +34,6 @@ true MultiByte - - Application - true - v142 - MultiByte - - - Application - false - v142 - true - MultiByte - @@ -67,12 +46,6 @@ - - - - - - ..\bin\$(PlatformName)\ @@ -83,7 +56,7 @@ false ..\bin\$(PlatformName)\ $(PlatformName)\$(Configuration)\ - $(ProjectName)I + $(ProjectName) @@ -95,7 +68,7 @@ ./win32lib true false - TRUE_FALSE_DEFINED;ENGLISH;WIN32;NDEBUG;_WINDOWS;_USRDLL;REDALERT_EXPORTS;%(PreprocessorDefinitions) + WINDOWS_IGNORE_PACKING_MISMATCH;TRUE_FALSE_DEFINED;ENGLISH;WIN32;NDEBUG;_WINDOWS;_USRDLL;REDALERT_EXPORTS;%(PreprocessorDefinitions) 1Byte false MultiThreaded @@ -123,12 +96,13 @@ false true ProgramDatabase - TRUE_FALSE_DEFINED;ENGLISH;WIN32;_DEBUG;_WINDOWS;_USRDLL;REDALERT_EXPORTS;%(PreprocessorDefinitions) + WINDOWS_IGNORE_PACKING_MISMATCH;TRUE_FALSE_DEFINED;ENGLISH;WIN32;_DEBUG;_WINDOWS;_USRDLL;REDALERT_EXPORTS;%(PreprocessorDefinitions) false MultiThreadedDebug 1Byte 4800;4244;4996 true + true winmm.lib;Ws2_32.lib;%(AdditionalDependencies) @@ -139,28 +113,6 @@ false - - - Level3 - Disabled - true - true - - - - - Level3 - MaxSpeed - true - true - true - true - - - true - true - - diff --git a/TIBERIANDAWN/TiberianDawn.vcxproj b/TIBERIANDAWN/TiberianDawn.vcxproj index 531fba3..a43c49f 100644 --- a/TIBERIANDAWN/TiberianDawn.vcxproj +++ b/TIBERIANDAWN/TiberianDawn.vcxproj @@ -49,7 +49,7 @@ false ..\bin\$(PlatformName)\ $(PlatformName)\$(Configuration)\ - $(ProjectName)I + $(ProjectName) false @@ -62,16 +62,17 @@ Level3 Disabled - TRUE_FALSE_DEFINED;WIN32;_DEBUG;_WINDOWS;_USRDLL;TIBERIANDAWN_EXPORTS;%(PreprocessorDefinitions) + WINDOWS_IGNORE_PACKING_MISMATCH;TRUE_FALSE_DEFINED;WIN32;_DEBUG;_WINDOWS;_USRDLL;TIBERIANDAWN_EXPORTS;%(PreprocessorDefinitions) ./win32lib ProgramDatabase false MultiThreadedDebug 4800;4244;4996 true - Default + 1Byte false true + true Windows @@ -96,14 +97,14 @@ MaxSpeed true true - TRUE_FALSE_DEFINED;WIN32;NDEBUG;_WINDOWS;_USRDLL;TIBERIANDAWN_EXPORTS;%(PreprocessorDefinitions) + WINDOWS_IGNORE_PACKING_MISMATCH;TRUE_FALSE_DEFINED;WIN32;NDEBUG;_WINDOWS;_USRDLL;TIBERIANDAWN_EXPORTS;%(PreprocessorDefinitions) ./win32lib 4800;4244;4996 false MultiThreaded false true - Default + 1Byte true diff --git a/TiberianDawn/TiberianDawn.vcxproj.filters b/TiberianDawn/TiberianDawn.vcxproj.filters new file mode 100644 index 0000000..fa54c35 --- /dev/null +++ b/TiberianDawn/TiberianDawn.vcxproj.filters @@ -0,0 +1,1235 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + * + + + {8f4fa00c-59af-42a6-824b-61fde12b0c64} + + + {7bd10c3e-67f3-4051-a861-06db6191bb48} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + + + 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 + + + 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\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Resources + + + 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 + + + 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 + + + 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\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + Source Files + + + Source Files\Win32Lib + + + Source Files + + + Source Files + + + + Source Files + + + + + Source Files\Win32Lib + + + Source Files + + + Source Files + + + Source Files + + + Source Files\Win32Lib + + + Source Files\Win32Lib + + + + + Source Files\Resources + + + \ No newline at end of file