From 7159bc654b8e36b4899e7f1106d4048aa7650978 Mon Sep 17 00:00:00 2001 From: Jonathan Campbell Date: Sat, 31 Jan 2015 19:04:34 -0800 Subject: [PATCH] Changes to block off MSVC-specific __asm blocks so that they compile for 32-bit, but not 64-bit. Fixed Visual Studio 2008 project files, it is now possible to compile a 64-bit Windows build of DOSBox-X. --- src/hardware/voodoo_data.h | 2 +- src/hardware/voodoo_types.h | 2 +- src/libs/porttalk/porttalk.cpp | 7 +- vs2008/config.h | 14 +- vs2008/dosbox-x.sln | 26 + vs2008/dosbox-x.suo | Bin 101376 -> 108032 bytes vs2008/dosbox-x.vcproj | 167 ++ .../libpng/projects/visualc71/libpng.vcproj | 1729 +++++++++++------ vs2008/sdl/VisualC/SDL/SDL.vcproj | 1656 ++++++++-------- vs2008/sdl/VisualC/SDLmain/SDLmain.vcproj | 846 ++++---- vs2008/sdlnet/VisualC/SDL_net_VS2008.vcproj | 1137 ++++++----- .../zlib/contrib/vstudio/vc9/zlibstat.vcproj | 32 +- 12 files changed, 3158 insertions(+), 2460 deletions(-) diff --git a/src/hardware/voodoo_data.h b/src/hardware/voodoo_data.h index 916c92eecfc..6f5dcdd5b45 100644 --- a/src/hardware/voodoo_data.h +++ b/src/hardware/voodoo_data.h @@ -819,7 +819,7 @@ INLINE UINT8 count_leading_zeros(UINT32 value) { INT32 result; -#if defined _MSC_VER +#if defined(_MSC_VER) && defined(_M_IX86) __asm { bsr eax,value diff --git a/src/hardware/voodoo_types.h b/src/hardware/voodoo_types.h index 85f0fba797c..88e6351258f 100644 --- a/src/hardware/voodoo_types.h +++ b/src/hardware/voodoo_types.h @@ -305,7 +305,7 @@ INLINE INT32 mul_32x32_shift(INT32 a, INT32 b, INT8 shift) { INT32 result; -#if defined _MSC_VER +#if defined(_MSC_VER) && defined(_M_IX86) __asm { mov eax,a diff --git a/src/libs/porttalk/porttalk.cpp b/src/libs/porttalk/porttalk.cpp index db9722b2621..72d68f0616b 100644 --- a/src/libs/porttalk/porttalk.cpp +++ b/src/libs/porttalk/porttalk.cpp @@ -1,7 +1,8 @@ #include "config.h" #include "logging.h" -#if defined (_MSC_VER) +#if defined (_MSC_VER) +# if defined (_M_IX86)/*x86 only*/ void outportb(Bit32u portid, Bit8u value) { __asm mov edx,portid __asm mov al,value @@ -46,7 +47,7 @@ Bit32u inportd(Bit32u portid) { __asm mov value,eax return value; } - +# endif #else void outportb(Bit32u portid, Bit8u value) { __asm__ volatile ( @@ -72,7 +73,7 @@ Bit8u inportb(Bit32u portid) { } #endif -#ifdef WIN32 +#if defined(WIN32) && defined(_M_IX86)/*WIN32 x86 only*/ // WIN specific #include "sdl.h" diff --git a/vs2008/config.h b/vs2008/config.h index 7fd26a39304..e1577cec5a6 100644 --- a/vs2008/config.h +++ b/vs2008/config.h @@ -1,5 +1,5 @@ /* config.h.in. Generated from configure.ac by autoheader. */ - +/* Hand-edited by Jonathan Campbell for Visual Studio 2008 */ /* * Copyright (C) 2002-2013 The DOSBox Team @@ -48,8 +48,15 @@ */ #undef C_DIRECTSERIAL +#ifdef _M_AMD64 /* Microsoft C++ amd64 */ +# undef C_DYNAMIC_X86 +# undef C_TARGETCPU +#else +/* The type of cpu this target has */ +#define C_TARGETCPU X86 /* Define to 1 to use x86 dynamic cpu core */ -#define C_DYNAMIC_X86 1 +# define C_DYNAMIC_X86 1 +#endif /* Define to 1 to enable fluidsynth MIDI synthesis */ #undef C_FLUIDSYNTH @@ -91,9 +98,6 @@ /* Define to 1 to enable screenshots, requires libpng */ #define C_SSHOT 1 -/* The type of cpu this target has */ -#define C_TARGETCPU X86 - /* Define to 1 to use a unaligned memory access */ #define C_UNALIGNED_MEMORY 1 diff --git a/vs2008/dosbox-x.sln b/vs2008/dosbox-x.sln index fbe62856880..eb3fb1f7608 100644 --- a/vs2008/dosbox-x.sln +++ b/vs2008/dosbox-x.sln @@ -29,33 +29,59 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {8A52284E-5115-453E-AD4B-87B8FCDB1244}.Debug|Win32.ActiveCfg = Debug|Win32 {8A52284E-5115-453E-AD4B-87B8FCDB1244}.Debug|Win32.Build.0 = Debug|Win32 + {8A52284E-5115-453E-AD4B-87B8FCDB1244}.Debug|x64.ActiveCfg = Debug|x64 + {8A52284E-5115-453E-AD4B-87B8FCDB1244}.Debug|x64.Build.0 = Debug|x64 {8A52284E-5115-453E-AD4B-87B8FCDB1244}.Release|Win32.ActiveCfg = Release|Win32 {8A52284E-5115-453E-AD4B-87B8FCDB1244}.Release|Win32.Build.0 = Release|Win32 + {8A52284E-5115-453E-AD4B-87B8FCDB1244}.Release|x64.ActiveCfg = Release|x64 + {8A52284E-5115-453E-AD4B-87B8FCDB1244}.Release|x64.Build.0 = Release|x64 {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32 {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64 {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32 {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64 {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32 {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64 {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32 {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64 {0008960E-E0DD-41A6-8265-00B31DDB4C21}.Debug|Win32.ActiveCfg = LIB Debug|Win32 {0008960E-E0DD-41A6-8265-00B31DDB4C21}.Debug|Win32.Build.0 = LIB Debug|Win32 + {0008960E-E0DD-41A6-8265-00B31DDB4C21}.Debug|x64.ActiveCfg = LIB Debug|x64 + {0008960E-E0DD-41A6-8265-00B31DDB4C21}.Debug|x64.Build.0 = LIB Debug|x64 {0008960E-E0DD-41A6-8265-00B31DDB4C21}.Release|Win32.ActiveCfg = LIB Release|Win32 {0008960E-E0DD-41A6-8265-00B31DDB4C21}.Release|Win32.Build.0 = LIB Release|Win32 + {0008960E-E0DD-41A6-8265-00B31DDB4C21}.Release|x64.ActiveCfg = LIB Release|x64 + {0008960E-E0DD-41A6-8265-00B31DDB4C21}.Release|x64.Build.0 = LIB Release|x64 {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = ReleaseWithoutAsm|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = ReleaseWithoutAsm|x64 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = ReleaseWithoutAsm|x64 {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = ReleaseWithoutAsm|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = ReleaseWithoutAsm|x64 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = ReleaseWithoutAsm|x64 {8AB3504F-5E58-4910-AFE8-7A1E595AC3F4}.Debug|Win32.ActiveCfg = Debug|Win32 {8AB3504F-5E58-4910-AFE8-7A1E595AC3F4}.Debug|Win32.Build.0 = Debug|Win32 + {8AB3504F-5E58-4910-AFE8-7A1E595AC3F4}.Debug|x64.ActiveCfg = Debug|x64 + {8AB3504F-5E58-4910-AFE8-7A1E595AC3F4}.Debug|x64.Build.0 = Debug|x64 {8AB3504F-5E58-4910-AFE8-7A1E595AC3F4}.Release|Win32.ActiveCfg = Release|Win32 {8AB3504F-5E58-4910-AFE8-7A1E595AC3F4}.Release|Win32.Build.0 = Release|Win32 + {8AB3504F-5E58-4910-AFE8-7A1E595AC3F4}.Release|x64.ActiveCfg = Release|x64 + {8AB3504F-5E58-4910-AFE8-7A1E595AC3F4}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vs2008/dosbox-x.suo b/vs2008/dosbox-x.suo index b8e9037ae4047e863d48726113554fcb74b5d275..f570cc39438df08e6e7ae64c2bc86e08c61d6621 100644 GIT binary patch delta 10407 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 diff --git a/vs2008/dosbox-x.vcproj b/vs2008/dosbox-x.vcproj index aa64d61d16d..8367c6797c9 100644 --- a/vs2008/dosbox-x.vcproj +++ b/vs2008/dosbox-x.vcproj @@ -12,6 +12,9 @@ + @@ -178,6 +181,170 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vs2008/libpng/projects/visualc71/libpng.vcproj b/vs2008/libpng/projects/visualc71/libpng.vcproj index 8baf4085031..4255d1adfd2 100644 --- a/vs2008/libpng/projects/visualc71/libpng.vcproj +++ b/vs2008/libpng/projects/visualc71/libpng.vcproj @@ -1,614 +1,1115 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vs2008/sdl/VisualC/SDL/SDL.vcproj b/vs2008/sdl/VisualC/SDL/SDL.vcproj index 3126c7be2ee..6fbb6785e94 100644 --- a/vs2008/sdl/VisualC/SDL/SDL.vcproj +++ b/vs2008/sdl/VisualC/SDL/SDL.vcproj @@ -1,828 +1,828 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vs2008/sdl/VisualC/SDLmain/SDLmain.vcproj b/vs2008/sdl/VisualC/SDLmain/SDLmain.vcproj index 664d3b52a0a..492e98f3b26 100644 --- a/vs2008/sdl/VisualC/SDLmain/SDLmain.vcproj +++ b/vs2008/sdl/VisualC/SDLmain/SDLmain.vcproj @@ -1,423 +1,423 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vs2008/sdlnet/VisualC/SDL_net_VS2008.vcproj b/vs2008/sdlnet/VisualC/SDL_net_VS2008.vcproj index a2c124e14db..0cea287d0ed 100644 --- a/vs2008/sdlnet/VisualC/SDL_net_VS2008.vcproj +++ b/vs2008/sdlnet/VisualC/SDL_net_VS2008.vcproj @@ -1,569 +1,568 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vs2008/zlib/contrib/vstudio/vc9/zlibstat.vcproj b/vs2008/zlib/contrib/vstudio/vc9/zlibstat.vcproj index 0160bf99f56..cef5a0c6763 100644 --- a/vs2008/zlib/contrib/vstudio/vc9/zlibstat.vcproj +++ b/vs2008/zlib/contrib/vstudio/vc9/zlibstat.vcproj @@ -96,8 +96,8 @@ @@ -244,8 +244,8 @@ @@ -392,8 +392,8 @@