From e4823ef52a5c7ef218c727a850edb38f3e3e1772 Mon Sep 17 00:00:00 2001 From: zilmar Date: Thu, 16 Nov 2017 06:12:45 +1100 Subject: [PATCH] [Build] Update project settings for release --- .../Project64-audio/Project64-audio.vcxproj | 2 +- Source/Project64-audio/Version.h | 43 ------------------- .../Project64-video/Project64-video.vcxproj | 2 +- Source/Script/UpdateVersion.cmd | 1 + Source/nragev20/NRage_Input_V2.vcxproj | 2 +- 5 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 Source/Project64-audio/Version.h diff --git a/Source/Project64-audio/Project64-audio.vcxproj b/Source/Project64-audio/Project64-audio.vcxproj index 6019ce18d..bfa40ea50 100644 --- a/Source/Project64-audio/Project64-audio.vcxproj +++ b/Source/Project64-audio/Project64-audio.vcxproj @@ -39,7 +39,7 @@ dsound.lib;%(AdditionalDependencies) - "$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(SolutionDir)Source\Project64-audio\Version.h.in" "$(SolutionDir)Source\Project64-audio\Version.h" + "$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(SolutionDir)Source\Project64-audio\Version.h.in" "$(SolutionDir)Source\Project64-audio\Version.h" diff --git a/Source/Project64-audio/Version.h b/Source/Project64-audio/Version.h deleted file mode 100644 index 2bcc2e30c..000000000 --- a/Source/Project64-audio/Version.h +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** -* * -* Project64-audio - A Nintendo 64 audio plugin. * -* http://www.pj64-emu.com/ * -* Copyright (C) 2017 Project64. All rights reserved. * -* * -* License: * -* GNU/GPLv2 http://www.gnu.org/licenses/gpl-2.0.html * -* * -****************************************************************************/ -#define STRINGIZE2(s) #s -#define STRINGIZE(s) STRINGIZE2(s) - -#define VERSION_MAJOR 1 -#define VERSION_MINOR 0 -#define VERSION_REVISION 1 -#define VERSION_BUILD 594 -#define GIT_VERSION "g169f9d9-dirty" - -#define VER_FILE_DESCRIPTION_STR "Project64-audio" -#define VER_FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD -#define VER_FILE_VERSION_STR STRINGIZE(VERSION_MAJOR) \ - "." STRINGIZE(VERSION_MINOR) \ - "." STRINGIZE(VERSION_REVISION) \ - "." STRINGIZE(VERSION_BUILD) \ - "-" GIT_VERSION - -#define VER_PRODUCTNAME_STR "Project64-audio" -#define VER_PRODUCT_VERSION VER_FILE_VERSION -#define VER_PRODUCT_VERSION_STR VER_FILE_VERSION_STR -#define VER_ORIGINAL_FILENAME_STR VER_PRODUCTNAME_STR ".dll" -#define VER_INTERNAL_NAME_STR VER_PRODUCTNAME_STR -#define VER_COPYRIGHT_STR "Copyright (C) 2017" - -#ifdef _DEBUG -#define VER_VER_DEBUG VS_FF_DEBUG -#else -#define VER_VER_DEBUG 0 -#endif - -#define VER_FILEOS VOS_NT_WINDOWS32 -#define VER_FILEFLAGS VER_VER_DEBUG -#define VER_FILETYPE VFT_DLL diff --git a/Source/Project64-video/Project64-video.vcxproj b/Source/Project64-video/Project64-video.vcxproj index bfd05e38f..2e792a317 100644 --- a/Source/Project64-video/Project64-video.vcxproj +++ b/Source/Project64-video/Project64-video.vcxproj @@ -46,7 +46,7 @@ - "$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(SolutionDir)Source\Project64-video\Version.h.in" "$(SolutionDir)Source\Project64-video\Version.h" + "$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(SolutionDir)Source\Project64-video\Version.h.in" "$(SolutionDir)Source\Project64-video\Version.h" diff --git a/Source/Script/UpdateVersion.cmd b/Source/Script/UpdateVersion.cmd index ea461d8cb..3e356eeb1 100644 --- a/Source/Script/UpdateVersion.cmd +++ b/Source/Script/UpdateVersion.cmd @@ -17,5 +17,6 @@ if not "%~3" == "" set OutFile="%~3" FOR /F "tokens=1 delims=" %%A in ('git describe --tags --long --dirty') do SET current_tag=%%A +echo "%base_dir%\Bin\%BuildMode%\UpdateVersion.exe" %InFile% %OutFile% "%current_tag%" "%base_dir%\Bin\%BuildMode%\UpdateVersion.exe" %InFile% %OutFile% "%current_tag%" diff --git a/Source/nragev20/NRage_Input_V2.vcxproj b/Source/nragev20/NRage_Input_V2.vcxproj index 68fc65476..dc2f77d0c 100644 --- a/Source/nragev20/NRage_Input_V2.vcxproj +++ b/Source/nragev20/NRage_Input_V2.vcxproj @@ -51,7 +51,7 @@ false - "$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(SolutionDir)Source\nragev20\Version.h.in" "$(SolutionDir)Source\nragev20\Version.h" + "$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(SolutionDir)Source\nragev20\Version.h.in" "$(SolutionDir)Source\nragev20\Version.h"