From 6aed305ac9ff783b7f667e0e18731964acdb81b2 Mon Sep 17 00:00:00 2001 From: Littleboy Date: Thu, 28 Nov 2013 01:15:49 -0500 Subject: CREATE_PROJECT: Ignore unused cl arguments when compiling with LLVM --- devtools/create_project/msbuild.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'devtools/create_project') diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp index 07ae20e7dc..8e97c0b9e9 100644 --- a/devtools/create_project/msbuild.cpp +++ b/devtools/create_project/msbuild.cpp @@ -435,7 +435,7 @@ void MSBuildProvider::createBuildProp(const BuildSetup &setup, bool isRelease, b "\t\t\t" << (configuration == "Analysis" ? "true" : "false") << "\n"; if (configuration == "LLVM") - properties << "\t\t\t-Wno-microsoft -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-reorder -Wpointer-arith -Wcast-qual -Wshadow -Wnon-virtual-dtor -Wwrite-strings -Wno-conversion -Wno-shorten-64-to-32 -Wno-sign-compare -Wno-four-char-constants -Wno-nested-anon-types %(AdditionalOptions)\n"; + properties << "\t\t\t-Wno-microsoft -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-reorder -Wpointer-arith -Wcast-qual -Wshadow -Wnon-virtual-dtor -Wwrite-strings -Wno-conversion -Wno-shorten-64-to-32 -Wno-sign-compare -Wno-four-char-constants -Wno-nested-anon-types -Qunused-arguments %(AdditionalOptions)\n"; properties << "\t\t\n" "\t\t\n" -- cgit v1.2.3 From ac781bd4697ede6fe10656927768d61ff4d660ab Mon Sep 17 00:00:00 2001 From: Littleboy Date: Fri, 6 Dec 2013 15:36:47 -0500 Subject: CREATE_PROJECT: Fix issues breaking compilation with LLVM - Current folder include - Build folder include (needs to be hardcoded) - NASM compilation directives --- devtools/create_project/msbuild.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'devtools/create_project') diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp index 8e97c0b9e9..018a04370f 100644 --- a/devtools/create_project/msbuild.cpp +++ b/devtools/create_project/msbuild.cpp @@ -360,7 +360,7 @@ void MSBuildProvider::outputGlobalPropFile(const BuildSetup &setup, std::ofstrea "\t\t\n" "\t\t\ttrue\n" "\t\t\t" << warnings << ";%(DisableSpecificWarnings)\n" - "\t\t\t$(" << LIBS_DEFINE << ")\\include;.\\;" << prefix << ";" << prefix << "\\engines;" << (setup.tests ? prefix + "\\test\\cxxtest;" : "") << "$(TargetDir);%(AdditionalIncludeDirectories)\n" + "\t\t\t$(" << LIBS_DEFINE << ")\\include;.;" << prefix << ";" << prefix << "\\engines;" << (setup.tests ? prefix + "\\test\\cxxtest;" : "") << "$(TargetDir);%(AdditionalIncludeDirectories)\n" "\t\t\t" << definesList << "%(PreprocessorDefinitions)\n" "\t\t\t" << ((setup.devTools || setup.tests) ? "Sync" : "") << "\n"; @@ -434,8 +434,11 @@ void MSBuildProvider::createBuildProp(const BuildSetup &setup, bool isRelease, b "\t\t\t" << (isWin32 ? "EditAndContinue" : "ProgramDatabase") << "\n" // For x64 format Edit and continue is not supported, thus we default to Program Database "\t\t\t" << (configuration == "Analysis" ? "true" : "false") << "\n"; - if (configuration == "LLVM") - properties << "\t\t\t-Wno-microsoft -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-reorder -Wpointer-arith -Wcast-qual -Wshadow -Wnon-virtual-dtor -Wwrite-strings -Wno-conversion -Wno-shorten-64-to-32 -Wno-sign-compare -Wno-four-char-constants -Wno-nested-anon-types -Qunused-arguments %(AdditionalOptions)\n"; + if (configuration == "LLVM") { + // FIXME The LLVM cl wrapper does not seem to work properly with the $(TargetDir) path so we hard-code the build folder until the issue is resolved + properties << "\t\t\t" << configuration << outputBitness <<";%(AdditionalIncludeDirectories)\n" + "\t\t\t-Wno-microsoft -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-reorder -Wpointer-arith -Wcast-qual -Wshadow -Wnon-virtual-dtor -Wwrite-strings -Wno-conversion -Wno-shorten-64-to-32 -Wno-sign-compare -Wno-four-char-constants -Wno-nested-anon-types -Qunused-arguments %(AdditionalOptions)\n"; + } properties << "\t\t\n" "\t\t\n" @@ -521,6 +524,7 @@ void MSBuildProvider::writeFileListToProject(const FileNode &dir, std::ofstream outputNasmCommand(projectFile, "Debug", (isDuplicate ? (*entry).prefix : "")); outputNasmCommand(projectFile, "Analysis", (isDuplicate ? (*entry).prefix : "")); outputNasmCommand(projectFile, "Release", (isDuplicate ? (*entry).prefix : "")); + outputNasmCommand(projectFile, "LLVM", (isDuplicate ? (*entry).prefix : "")); projectFile << "\t\t\n"; } -- cgit v1.2.3 From 60f6e9ee9328901cc4448c0fddb2b85a227be32d Mon Sep 17 00:00:00 2001 From: Littleboy Date: Sun, 8 Dec 2013 08:45:48 -0500 Subject: CREATE_PROJECT: Add batch file to install natvis file --- devtools/create_project/scripts/install-natvis.bat | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 devtools/create_project/scripts/install-natvis.bat (limited to 'devtools/create_project') diff --git a/devtools/create_project/scripts/install-natvis.bat b/devtools/create_project/scripts/install-natvis.bat new file mode 100644 index 0000000000..62186df7bf --- /dev/null +++ b/devtools/create_project/scripts/install-natvis.bat @@ -0,0 +1,41 @@ +@echo off +echo Installing Visual Studio debugger integration... + +REM On 2000 & XP, the folder is "My Documents" but VS 2012 is not supported on those OSes +SET DOCUMENTS="%USERPROFILE%\Documents" +set FOUND=0 + +REM Set current folder +cd /d %~dp0 + +:INSTALL_VS11 +SET FOLDER="%DOCUMENTS%\Visual Studio 2012" +IF EXIST %FOLDER% ( + echo Visual Studio 2012 + copy scummvm.natvis %FOLDER%\Visualizers + IF NOT %ERRORLEVEL% == 0 GOTO FAILED + SET FOUND=1 +) + +:INSTALL_VS12 +SET FOLDER="%DOCUMENTS%\Visual Studio 2013" +IF EXIST %FOLDER% ( + echo Visual Studio 2013 + copy scummvm.natvis %FOLDER%\Visualizers + IF NOT %ERRORLEVEL% == 0 GOTO FAILED + SET FOUND=1 +) + +IF %FOUND% == 1 goto SUCCESS +echo Failed to find Visual Studio user folder. + +:SUCCESS +echo. +echo Done! +goto END + +:FAILED +echo Failed to install visualization file + +:END +pause -- cgit v1.2.3 From fa9eb119c076e46cae9eebe93b9aabc4fd76713f Mon Sep 17 00:00:00 2001 From: Littleboy Date: Sun, 8 Dec 2013 08:46:16 -0500 Subject: CREATE_PROJECT: Add Graphics::Surface to natvis and register for Image Watch --- devtools/create_project/scripts/scummvm.natvis | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'devtools/create_project') diff --git a/devtools/create_project/scripts/scummvm.natvis b/devtools/create_project/scripts/scummvm.natvis index ffeced7cff..995668690e 100644 --- a/devtools/create_project/scripts/scummvm.natvis +++ b/devtools/create_project/scripts/scummvm.natvis @@ -15,6 +15,29 @@ --> + + + + + + + + + + UINT8 + + 1 + 2 + + RGBA + + w + h + pitch + pixels + + + {{size = {_size}}} -- cgit v1.2.3