diff options
| author | Littleboy | 2011-04-24 12:34:57 -0400 |
|---|---|---|
| committer | Littleboy | 2011-04-24 16:59:46 -0400 |
| commit | 11b907ebf45f5a0707c2748b8f7413b2910976a8 (patch) | |
| tree | a85b869ce6eb2495001f75a0c6cd198d0e2ed842 /devtools/create_project/msvc.cpp | |
| parent | 4f708b021269c67da42177df8170a86d073c6e49 (diff) | |
| download | scummvm-rg350-11b907ebf45f5a0707c2748b8f7413b2910976a8.tar.gz scummvm-rg350-11b907ebf45f5a0707c2748b8f7413b2910976a8.tar.bz2 scummvm-rg350-11b907ebf45f5a0707c2748b8f7413b2910976a8.zip | |
CREATE_PROJECT: Update revision number support (fixes bug #3280881)
Replace existing environment variable based revision number support by a file-based method
- Generate a special header file in the build output folder with the current revision number
- Include the new header file from internal_version.h when a specific define is set
- Update create_project to define SCUMMVM_INTERNAL_REVISION as needed and add the build output folder to the include path
- Remove support for git-svn clones in the revision script (not useful anymore after the switch to git)
Diffstat (limited to 'devtools/create_project/msvc.cpp')
| -rw-r--r-- | devtools/create_project/msvc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp index e2fff59c46..ccdf4ac82b 100644 --- a/devtools/create_project/msvc.cpp +++ b/devtools/create_project/msvc.cpp @@ -124,7 +124,7 @@ void MSVCProvider::createGlobalProp(const BuildSetup &setup) { if (!properties) error("Could not open \"" + setup.outputDir + '/' + "ScummVM_Global" + getPropertiesExtension() + "\" for writing"); - outputGlobalPropFile(properties, 32, setup.defines, convertPathToWin(setup.filePrefix)); + outputGlobalPropFile(properties, 32, setup.defines, convertPathToWin(setup.filePrefix), setup.runBuildEvents); properties.close(); properties.open((setup.outputDir + '/' + "ScummVM_Global64" + getPropertiesExtension()).c_str()); @@ -143,7 +143,7 @@ void MSVCProvider::createGlobalProp(const BuildSetup &setup) { x64Defines.push_back("WIN32"); x64Defines.push_back("SDL_BACKEND"); - outputGlobalPropFile(properties, 64, x64Defines, convertPathToWin(setup.filePrefix)); + outputGlobalPropFile(properties, 64, x64Defines, convertPathToWin(setup.filePrefix), setup.runBuildEvents); } std::string MSVCProvider::getPreBuildEvent() const { @@ -152,7 +152,7 @@ std::string MSVCProvider::getPreBuildEvent() const { cmdLine = "@echo off\n" "echo Executing Pre-Build script...\n" "echo.\n" - "@call "$(SolutionDir)../../devtools/create_project/scripts/prebuild.cmd" "$(SolutionDir)/../.."\n" + "@call "$(SolutionDir)../../devtools/create_project/scripts/prebuild.cmd" "$(SolutionDir)/../.." "$(TargetDir)"\n" "EXIT /B0"; return cmdLine; |