diff options
-rw-r--r-- | README | 8 | ||||
-rw-r--r-- | common/endian.h | 3 | ||||
-rw-r--r-- | common/singleton.h | 4 | ||||
-rw-r--r-- | common/util.h | 2 | ||||
-rw-r--r-- | devtools/README | 2 | ||||
-rw-r--r-- | devtools/create_project/create_project.cpp | 5 | ||||
-rw-r--r-- | devtools/create_project/msvc10/create_project.vcxproj | 2 | ||||
-rw-r--r-- | devtools/create_project/msvc11/create_project.vcxproj | 2 | ||||
-rw-r--r-- | devtools/create_project/msvc12/create_project.vcxproj | 2 | ||||
-rw-r--r-- | devtools/create_project/msvc8/create_project.sln | 20 | ||||
-rw-r--r-- | devtools/create_project/msvc8/create_project.vcproj | 251 | ||||
-rw-r--r-- | devtools/create_project/visualstudio.cpp | 8 | ||||
-rw-r--r-- | dists/msvc8/create_msvc8.bat | 105 | ||||
-rw-r--r-- | dists/msvc8/readme.txt | 6 | ||||
-rw-r--r-- | ports.mk | 2 |
15 files changed, 13 insertions, 409 deletions
@@ -2281,15 +2281,15 @@ debug messages (see http://www.sysinternals.com/ntw2k/freeware/debugview.shtml). respectively http://wiki.scummvm.org/index.php/Compiling_ScummVM/MinGW - Microsoft Visual C++ 8/9/10: - * Read up on how to create the project files in "dists\msvc8", - "dists\msvc9" respectively "dists\msvc10". + Microsoft Visual C++ 9+: + * Read up on how to create the project files in the appropriate + "dists\msvc*" directory. * Open the resulting solution file. * Enter the path to the needed libraries and includes in Tools|Options|Projects and Solutions|VC++ Directories". * Now it should compile successfully. * For more information refer to: - http://wiki.scummvm.org/index.php/Compiling_ScummVM/VS2005 + http://wiki.scummvm.org/index.php/Compiling_ScummVM/Visual_Studio Windows Mobile: * Please refer to: diff --git a/common/endian.h b/common/endian.h index 529e7f5ac0..6d6563f802 100644 --- a/common/endian.h +++ b/common/endian.h @@ -92,8 +92,7 @@ return __builtin_bswap32(a); } -// test for MSVC 7 or newer -#elif defined(_MSC_VER) && _MSC_VER >= 1300 +#elif defined(_MSC_VER) FORCEINLINE uint32 SWAP_BYTES_32(uint32 a) { return _byteswap_ulong(a); diff --git a/common/singleton.h b/common/singleton.h index 13bdb0c3a3..9bcd590183 100644 --- a/common/singleton.h +++ b/common/singleton.h @@ -44,8 +44,8 @@ private: * and you specialise makeInstance to return an instance of a subclass. */ //template<class T> -#if defined(_WIN32_WCE) || defined(_MSC_VER) || defined(__WINS__) -//FIXME evc4 and msvc7 doesn't like it as private member +#if defined(__WINS__) +//FIXME verify if __WINS__ needs this still public: #endif static T *makeInstance() { diff --git a/common/util.h b/common/util.h index 1c0e45662e..f51aa00925 100644 --- a/common/util.h +++ b/common/util.h @@ -72,7 +72,7 @@ template<typename T> inline void SWAP(T &a, T &b) { T tmp = a; a = b; b = tmp; } # define SCUMMVM_CURRENT_FUNCTION __PRETTY_FUNCTION__ #elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901) # define SCUMMVM_CURRENT_FUNCTION __func__ -#elif defined(_MSC_VER) && _MSC_VER >= 1300 +#elif defined(_MSC_VER) # define SCUMMVM_CURRENT_FUNCTION __FUNCTION__ #else # define SCUMMVM_CURRENT_FUNCTION "<unknown>" diff --git a/devtools/README b/devtools/README index 482c24edc2..509048bfe0 100644 --- a/devtools/README +++ b/devtools/README @@ -72,7 +72,7 @@ create_mort (Strangerke) create_project (LordHoto, Littleboy) -------------- - Creates project files for Visual Studio 2005, 2008, 2010, 2012, Xcode and + Creates project files for Visual Studio 2008, 2010, 2012, 2013, Xcode and Code::Blocks out of the configure / Makefile based build system. It also offers a way to enable or disable certain engines and the use of external libraries similar to configure. Run the tool without diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index 876c116b5c..5fadfebbf3 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -175,7 +175,7 @@ int main(int argc, char *argv[]) { msvcVersion = atoi(argv[++i]); - if (msvcVersion != 8 && msvcVersion != 9 && msvcVersion != 10 && msvcVersion != 11 && msvcVersion != 12) { + if (msvcVersion != 9 && msvcVersion != 10 && msvcVersion != 11 && msvcVersion != 12) { std::cerr << "ERROR: Unsupported version: \"" << msvcVersion << "\" passed to \"--msvc-version\"!\n"; return -1; } @@ -526,7 +526,7 @@ int main(int argc, char *argv[]) { projectWarnings["m4"].push_back("4355"); - if (msvcVersion == 8 || msvcVersion == 9) + if (msvcVersion == 9) provider = new CreateProjectTool::VisualStudioProvider(globalWarnings, projectWarnings, msvcVersion); else provider = new CreateProjectTool::MSBuildProvider(globalWarnings, projectWarnings, msvcVersion); @@ -619,7 +619,6 @@ void displayHelp(const char *exe) { "\n" "MSVC specific settings:\n" " --msvc-version version set the targeted MSVC version. Possible values:\n" - " 8 stands for \"Visual Studio 2005\"\n" " 9 stands for \"Visual Studio 2008\"\n" " 10 stands for \"Visual Studio 2010\"\n" " 11 stands for \"Visual Studio 2012\"\n" diff --git a/devtools/create_project/msvc10/create_project.vcxproj b/devtools/create_project/msvc10/create_project.vcxproj index 40c515f26b..80dfd5e8d3 100644 --- a/devtools/create_project/msvc10/create_project.vcxproj +++ b/devtools/create_project/msvc10/create_project.vcxproj @@ -61,7 +61,6 @@ <Command>@echo off xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> </PostBuildEvent> @@ -87,7 +86,6 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> <Command>@echo off xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> </PostBuildEvent> diff --git a/devtools/create_project/msvc11/create_project.vcxproj b/devtools/create_project/msvc11/create_project.vcxproj index c87461c049..8bbd25e9ba 100644 --- a/devtools/create_project/msvc11/create_project.vcxproj +++ b/devtools/create_project/msvc11/create_project.vcxproj @@ -66,7 +66,6 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> </PostBuildEvent> @@ -93,7 +92,6 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> </PostBuildEvent> diff --git a/devtools/create_project/msvc12/create_project.vcxproj b/devtools/create_project/msvc12/create_project.vcxproj index c26b1e5f45..6da1556547 100644 --- a/devtools/create_project/msvc12/create_project.vcxproj +++ b/devtools/create_project/msvc12/create_project.vcxproj @@ -66,7 +66,6 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc12\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> </PostBuildEvent> @@ -94,7 +93,6 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc12\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> </PostBuildEvent> diff --git a/devtools/create_project/msvc8/create_project.sln b/devtools/create_project/msvc8/create_project.sln deleted file mode 100644 index 4a0152f33f..0000000000 --- a/devtools/create_project/msvc8/create_project.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "create_project", "create_project.vcproj", "{CF177559-077D-4A08-AABE-BE0FD35F6C63}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.ActiveCfg = Debug|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.Build.0 = Debug|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.ActiveCfg = Release|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/devtools/create_project/msvc8/create_project.vcproj b/devtools/create_project/msvc8/create_project.vcproj deleted file mode 100644 index 6e9e0d5cb0..0000000000 --- a/devtools/create_project/msvc8/create_project.vcproj +++ /dev/null @@ -1,251 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="create_project" - ProjectGUID="{CF177559-077D-4A08-AABE-BE0FD35F6C63}" - RootNamespace="create_project" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - WarningLevel="4" - DebugInformationFormat="4" - DisableSpecificWarnings="4003;4512;4127" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Rpcrt4.lib" - GenerateDebugInformation="true" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="1" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - WarningLevel="3" - DebugInformationFormat="3" - DisableSpecificWarnings="4003;4512;4127" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Rpcrt4.lib" - GenerateDebugInformation="true" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File - RelativePath="..\create_project.cpp" - > - </File> - <File - RelativePath="..\codeblocks.cpp" - > - </File> - <File - RelativePath="..\msvc.cpp" - > - </File> - <File - RelativePath="..\msbuild.cpp" - > - </File> - <File - RelativePath="..\visualstudio.cpp" - > - </File> - <File - RelativePath="..\xcode.cpp" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - <File - RelativePath="..\create_project.h" - > - </File> - <File - RelativePath="..\codeblocks.h" - > - </File> - <File - RelativePath="..\config.h" - > - </File> - <File - RelativePath="..\msvc.h" - > - </File> - <File - RelativePath="..\msbuild.h" - > - </File> - <File - RelativePath="..\visualstudio.h" - > - </File> - <File - RelativePath="..\xcode.h" - > - </File> - </Filter> - <Filter - Name="Scripts" - Filter="vbs;cmd" - UniqueIdentifier="{45B110C8-4C64-4677-8ED6-F9A93C6D55A0}" - > - <File - RelativePath="..\scripts\prebuild.cmd" - > - </File> - <File - RelativePath="..\scripts\postbuild.cmd" - > - </File> - <File - RelativePath="..\scripts\revision.vbs" - > - </File> - <File - RelativePath="..\scripts\installer.vbs" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp index 84bc674f9a..b2ed58cb58 100644 --- a/devtools/create_project/visualstudio.cpp +++ b/devtools/create_project/visualstudio.cpp @@ -29,7 +29,7 @@ namespace CreateProjectTool { ////////////////////////////////////////////////////////////////////////// -// Visual Studio Provider (Visual Studio 2005 & 2008) +// Visual Studio Provider (Visual Studio 2008) ////////////////////////////////////////////////////////////////////////// VisualStudioProvider::VisualStudioProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, const int version) @@ -48,9 +48,6 @@ int VisualStudioProvider::getVisualStudioVersion() { if (_version == 9) return 2008; - if (_version == 8) - return 2005; - error("Unsupported version passed to getVisualStudioVersion"); } @@ -70,8 +67,7 @@ void VisualStudioProvider::createProjectFile(const std::string &name, const std: "\tRootNamespace=\"" << name << "\"\n" "\tKeyword=\"Win32Proj\"\n"; - if (_version >= 9) - project << "\tTargetFrameworkVersion=\"131072\"\n"; + project << "\tTargetFrameworkVersion=\"131072\"\n"; project << "\t>\n" "\t<Platforms>\n" diff --git a/dists/msvc8/create_msvc8.bat b/dists/msvc8/create_msvc8.bat deleted file mode 100644 index 1e0d339001..0000000000 --- a/dists/msvc8/create_msvc8.bat +++ /dev/null @@ -1,105 +0,0 @@ -@echo off - -echo. -echo Automatic creation of the MSVC9 project files -echo. - -if "%~1"=="/stable" goto stable -if "%~1"=="/STABLE" goto stable -if "%~1"=="/all" goto all -if "%~1"=="/ALL" goto all -if "%~1"=="/tools" goto tools -if "%~1"=="/TOOLS" goto tools -if "%~1"=="/tests" goto tests -if "%~1"=="/TESTS" goto tests -if "%~1"=="/clean" goto clean_check -if "%~1"=="/CLEAN" goto clean_check -if "%~1"=="/help" goto command_help -if "%~1"=="/HELP" goto command_help -if "%~1"=="/?" goto command_help - -if "%~1"=="" goto check_tool - -echo Invalid command parameter: %~1 -echo. - -:command_help -echo Valid command parameters are: -echo stable Generated stable engines project files -echo all Generate all engines project files -echo tools Generate project files for the devtools -echo clean Clean generated project files -echo help Show help message -goto done - -:check_tool -if not exist create_project.exe goto no_tool - -:question -echo. -set batchanswer=S -set /p batchanswer="Enable stable engines only, or all engines? (S/a)" -if "%batchanswer%"=="s" goto stable -if "%batchanswer%"=="S" goto stable -if "%batchanswer%"=="a" goto all -if "%batchanswer%"=="A" goto all -goto question - -:no_tool -echo create_project.exe not found in the current folder. -echo You need to build it first and copy it in this -echo folder -goto done - -:all -echo. -echo Creating project files with all engines enabled (stable and unstable) -echo. -create_project ..\.. --enable-all-engines --msvc --msvc-version 8 -goto done - -:stable -echo. -echo Creating normal project files, with only the stable engines enabled -echo. -create_project ..\.. --msvc --msvc-version 8 -goto done - -:tools -echo. -echo Creating tools project files -echo. -create_project ..\.. --tools --msvc --msvc-version 8 -goto done - -:tests -echo. -echo Creating tests project files -echo. -create_project ..\.. --tests --msvc --msvc-version 8 -goto done - -:clean_check -echo. -set cleananswer=N -set /p cleananswer="This will remove all project files. Are you sure you want to continue? (N/y)" -if "%cleananswer%"=="n" goto done -if "%cleananswer%"=="N" goto done -if "%cleananswer%"=="y" goto clean -if "%cleananswer%"=="Y" goto clean -goto clean_check - -:clean -echo. -echo Removing all project files -del /Q *.vcproj* > NUL 2>&1 -del /Q *.vsprops > NUL 2>&1 -del /Q *.sln* > NUL 2>&1 -del /Q scummvm* > NUL 2>&1 -del /Q devtools* > NUL 2>&1 -del /Q test_runner.cpp -goto done - -:done -echo. -pause diff --git a/dists/msvc8/readme.txt b/dists/msvc8/readme.txt deleted file mode 100644 index 95b55e973a..0000000000 --- a/dists/msvc8/readme.txt +++ /dev/null @@ -1,6 +0,0 @@ -The Visual Studio project files can now be created automatically from the GCC -files using the create_project tool inside the /devtools/create_project folder. - -To create the default project files, build create_project.exe, copy it inside -this folder and run the create_msvc8.bat file for a default build. You can run -create_project.exe with no parameters to check the possible command-line options @@ -314,8 +314,6 @@ else ifeq "$(CUR_BRANCH)" "" endif @echo Creating Code::Blocks project files... @cd $(srcdir)/dists/codeblocks && ../../devtools/create_project/create_project ../.. --codeblocks >/dev/null && git add -f engines/plugins_table.h *.workspace *.cbp - @echo Creating MSVC8 project files... - @cd $(srcdir)/dists/msvc8 && ../../devtools/create_project/create_project ../.. --msvc --msvc-version 8 >/dev/null && git add -f engines/plugins_table.h *.sln *.vcproj *.vsprops @echo Creating MSVC9 project files... @cd $(srcdir)/dists/msvc9 && ../../devtools/create_project/create_project ../.. --msvc --msvc-version 9 >/dev/null && git add -f engines/plugins_table.h *.sln *.vcproj *.vsprops @echo Creating MSVC10 project files... |