From 9fbaadd8949040f15b7da3d3d5574aa6c27d1f39 Mon Sep 17 00:00:00 2001 From: Volker Ruppert Date: Sun, 17 Mar 2024 14:19:03 +0100 Subject: [PATCH] Started updating the standard workspace for MSVC. Updated AVX and FPU project files to make them compile. Added new project file for the softfloat3e module. With the current version the softfloat3e.lib is created, but it doesn't link with bochs.exe, so the build fails with more than 100 unresolved externals. Manually linking on the MSVC command line using the created *.lib and *.obj files works and bochs.exe is usable. I still haven't found out why linking from the IDE fails. TODO: After fixing this issue, updating the plugins workspace should be no problem. --- .../win32/vs2019-workspace/vs2019/avx.vcxproj | 2 +- .../win32/vs2019-workspace/vs2019/bochs.sln | 11 + .../win32/vs2019-workspace/vs2019/fpu.vcxproj | 110 +++-- .../vs2019/softfloat3e.vcxproj | 436 ++++++++++++++++++ 4 files changed, 502 insertions(+), 57 deletions(-) create mode 100644 bochs/build/win32/vs2019-workspace/vs2019/softfloat3e.vcxproj diff --git a/bochs/build/win32/vs2019-workspace/vs2019/avx.vcxproj b/bochs/build/win32/vs2019-workspace/vs2019/avx.vcxproj index a0b2c57e1..33bec075f 100644 --- a/bochs/build/win32/vs2019-workspace/vs2019/avx.vcxproj +++ b/bochs/build/win32/vs2019-workspace/vs2019/avx.vcxproj @@ -216,7 +216,7 @@ - + diff --git a/bochs/build/win32/vs2019-workspace/vs2019/bochs.sln b/bochs/build/win32/vs2019-workspace/vs2019/bochs.sln index 6e15e4e50..bb14e6557 100644 --- a/bochs/build/win32/vs2019-workspace/vs2019/bochs.sln +++ b/bochs/build/win32/vs2019-workspace/vs2019/bochs.sln @@ -6,6 +6,7 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bochs", "bochs.vcxproj", "{A09427D6-1B00-4416-9B29-20E659ED2606}" ProjectSection(ProjectDependencies) = postProject {57A4215B-7E87-447A-A0F4-5BBC0866A3D8} = {57A4215B-7E87-447A-A0F4-5BBC0866A3D8} + {BDA1EB83-D53E-41A7-825F-0EFDC3D643E3} = {BDA1EB83-D53E-41A7-825F-0EFDC3D643E3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bx_debug", "bx_debug.vcxproj", "{88F11CBB-D14A-4981-A91A-BFE987C756E8}" @@ -45,6 +46,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avx", "avx.vcxproj", "{57A4 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bxhub", "bxhub.vcxproj", "{AD9F8A93-9C9B-4A46-8A13-9113D72FD24A}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "softfloat3e", "softfloat3e.vcxproj", "{BDA1EB83-D53E-41A7-825F-0EFDC3D643E3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -197,6 +200,14 @@ Global {AD9F8A93-9C9B-4A46-8A13-9113D72FD24A}.Release|Win32.Build.0 = Release|Win32 {AD9F8A93-9C9B-4A46-8A13-9113D72FD24A}.Release|x64.ActiveCfg = Release|x64 {AD9F8A93-9C9B-4A46-8A13-9113D72FD24A}.Release|x64.Build.0 = Release|x64 + {BDA1EB83-D53E-41A7-825F-0EFDC3D643E3}.Debug|Win32.ActiveCfg = Debug|Win32 + {BDA1EB83-D53E-41A7-825F-0EFDC3D643E3}.Debug|Win32.Build.0 = Debug|Win32 + {BDA1EB83-D53E-41A7-825F-0EFDC3D643E3}.Debug|x64.ActiveCfg = Debug|x64 + {BDA1EB83-D53E-41A7-825F-0EFDC3D643E3}.Debug|x64.Build.0 = Debug|x64 + {BDA1EB83-D53E-41A7-825F-0EFDC3D643E3}.Release|Win32.ActiveCfg = Release|Win32 + {BDA1EB83-D53E-41A7-825F-0EFDC3D643E3}.Release|Win32.Build.0 = Release|Win32 + {BDA1EB83-D53E-41A7-825F-0EFDC3D643E3}.Release|x64.ActiveCfg = Release|x64 + {BDA1EB83-D53E-41A7-825F-0EFDC3D643E3}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/bochs/build/win32/vs2019-workspace/vs2019/fpu.vcxproj b/bochs/build/win32/vs2019-workspace/vs2019/fpu.vcxproj index 1f4753e0e..55f7f6481 100644 --- a/bochs/build/win32/vs2019-workspace/vs2019/fpu.vcxproj +++ b/bochs/build/win32/vs2019-workspace/vs2019/fpu.vcxproj @@ -5,14 +5,14 @@ Debug Win32 - - Debug - x64 - Release Win32 + + Debug + x64 + Release x64 @@ -22,49 +22,49 @@ {5661CD4E-BA54-4E67-A586-BB014AC94614} - - StaticLibrary - v142 - false - MultiByte - - - StaticLibrary - v142 - false - MultiByte - StaticLibrary v142 false MultiByte + + StaticLibrary + v142 + false + MultiByte + StaticLibrary v142 false MultiByte + + StaticLibrary + v142 + false + MultiByte + - - - - - - - - + + + + + + + + <_ProjectFileVersion>12.0.21005.1 @@ -108,36 +108,6 @@ .\..\obj-debug\fpu\fpu.bsc - - - $(IntDir)BuildLog-$(TargetName).log - - - Disabled - ..;..\instrument\stubs;.\stubs;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;_WINDOWS;PARANOID;DEBUGGING;NO_ASSEMBLER;USE_WITH_CPU_SIM;%(PreprocessorDefinitions) - MultiThreadedDebug - .\..\obj-debug\fpu\fpu.pch - .\..\obj-debug\fpu\ - .\..\obj-debug\fpu\ - .\..\obj-debug\fpu\ - Level3 - true - OldStyle - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - .\..\obj-debug\fpu.lib - true - - - true - .\..\obj-debug\fpu\fpu.bsc - - $(IntDir)BuildLog-$(TargetName).log @@ -172,6 +142,36 @@ .\..\obj-release\fpu\fpu.bsc + + + $(IntDir)BuildLog-$(TargetName).log + + + Disabled + ..;..\instrument\stubs;.\stubs;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_WINDOWS;PARANOID;DEBUGGING;NO_ASSEMBLER;USE_WITH_CPU_SIM;%(PreprocessorDefinitions) + MultiThreadedDebug + .\..\obj-debug\fpu\fpu.pch + .\..\obj-debug\fpu\ + .\..\obj-debug\fpu\ + .\..\obj-debug\fpu\ + Level3 + true + OldStyle + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + .\..\obj-debug\fpu.lib + true + + + true + .\..\obj-debug\fpu\fpu.bsc + + $(IntDir)BuildLog-$(TargetName).log @@ -223,11 +223,9 @@ - - diff --git a/bochs/build/win32/vs2019-workspace/vs2019/softfloat3e.vcxproj b/bochs/build/win32/vs2019-workspace/vs2019/softfloat3e.vcxproj new file mode 100644 index 000000000..cde1645c2 --- /dev/null +++ b/bochs/build/win32/vs2019-workspace/vs2019/softfloat3e.vcxproj @@ -0,0 +1,436 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {bda1eb83-d53e-41a7-825f-0efdc3d643e3} + + + + StaticLibrary + v142 + false + MultiByte + + + StaticLibrary + v142 + false + MultiByte + + + StaticLibrary + v142 + false + MultiByte + + + StaticLibrary + v142 + false + MultiByte + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + .\..\obj-debug\ + .\..\obj-debug\softfloat3e\ + + + + .\..\obj-release\ + .\..\obj-release\softfloat3e\ + + + + $(IntDir)BuildLog-$(TargetName).log + + + Disabled + ..;..\cpu\softfloat3e\include;..\cpu\softfloat3e\8086-SSE + WIN32;_DEBUG;_CONSOLE;INLINE_LEVEL=5;SOFTFLOAT_FAST_DIV32TO16;SOFTFLOAT_FAST_DIV64TO32;%(PreprocessorDefinitions) + MultiThreadedDebug + .\..\obj-debug\softfloat3e\softfloat3e.pch + .\..\obj-debug\softfloat3e\ + .\..\obj-debug\softfloat3e\ + .\..\obj-debug\softfloat3e\ + Level3 + true + OldStyle + CompileAsCpp + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + .\..\obj-debug\softfloat3e.lib + true + + + true + .\..\obj-debug\softfloat3e\softfloat3e.bsc + + + + + $(IntDir)BuildLog-$(TargetName).log + + + MaxSpeed + OnlyExplicitInline + ..;..\cpu\softfloat3e\include;..\cpu\softfloat3e\8086-SSE + WIN32;NDEBUG;_CONSOLE;INLINE_LEVEL=5;SOFTFLOAT_FAST_DIV32TO16;SOFTFLOAT_FAST_DIV64TO32;%(PreprocessorDefinitions) + true + + MultiThreaded + true + .\..\obj-release\softfloat3e\softfloat3e.pch + .\..\obj-release\softfloat3e\ + .\..\obj-release\softfloat3e\ + .\..\obj-release\softfloat3e\ + Level3 + true + FastCall + CompileAsCpp + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + .\..\obj-release\softfloat3e.lib + true + + + true + .\..\obj-release\softfloat3e\softfloat3e.bsc + + + + + $(IntDir)BuildLog-$(TargetName).log + + + Disabled + ..;..\cpu\softfloat3e\include;..\cpu\softfloat3e\8086-SSE + _DEBUG;_CONSOLE;INLINE_LEVEL=5;SOFTFLOAT_FAST_DIV32TO16;SOFTFLOAT_FAST_DIV64TO32;%(PreprocessorDefinitions) + MultiThreadedDebug + .\..\obj-debug\softfloat3e\softfloat3e.pch + .\..\obj-debug\softfloat3e\ + .\..\obj-debug\softfloat3e\ + .\..\obj-debug\softfloat3e\ + Level3 + true + OldStyle + CompileAsCpp + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + .\..\obj-debug\softfloat3e.lib + true + + + true + .\..\obj-debug\softfloat3e\softfloat3e.bsc + + + + + $(IntDir)BuildLog-$(TargetName).log + + + MaxSpeed + OnlyExplicitInline + ..;..\cpu\softfloat3e\include;..\cpu\softfloat3e\8086-SSE + WIN32;NDEBUG;_LIB;PARANOID;DEBUGGING;NO_ASSEMBLER;USE_WITH_CPU_SIM;_CRT_SECURE_NO_WARNINGS;INLINE_LEVEL=5;SOFTFLOAT_FAST_DIV32TO16;SOFTFLOAT_FAST_DIV64TO32;%(PreprocessorDefinitions) + true + + + MultiThreaded + true + .\..\obj-release\softfloat3e\softfloat3e.pch + .\..\obj-release\softfloat3e\ + .\..\obj-release\softfloat3e\ + .\..\obj-release\softfloat3e\ + Level3 + true + FastCall + CompileAsCpp + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + .\..\obj-release\softfloat3e.lib + true + + + true + .\..\obj-release\softfloat3e\softfloat3e.bsc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file