From 973f44cd94f4c0f2e096ceb1d472bad91af19a25 Mon Sep 17 00:00:00 2001 From: zilmar Date: Thu, 16 Nov 2017 05:59:37 +1100 Subject: [PATCH] [build] Update dependency on UpdateVersion and remove Version.h --- Project64.sln | 9 +++++ Source/Project64-core/Version.h | 49 -------------------------- Source/Project64-video/Version.h | 46 ------------------------- Source/RSP/Version.h | 59 -------------------------------- Source/nragev20/Version.h | 55 ----------------------------- 5 files changed, 9 insertions(+), 209 deletions(-) delete mode 100644 Source/Project64-core/Version.h delete mode 100644 Source/Project64-video/Version.h delete mode 100644 Source/RSP/Version.h delete mode 100644 Source/nragev20/Version.h diff --git a/Project64.sln b/Project64.sln index 1fe4be304..b61fe9a00 100644 --- a/Project64.sln +++ b/Project64.sln @@ -32,6 +32,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64Setup", "Source\In EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PJ64 NRage", "Source\nragev20\NRage_Input_V2.vcxproj", "{FD617E80-9E40-4138-85DA-B94633972E6A}" + ProjectSection(ProjectDependencies) = postProject + {1968162C-0793-491D-91A1-81645A24D399} = {1968162C-0793-491D-91A1-81645A24D399} + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PropertySheets", "PropertySheets", "{181AA451-63A7-4E3B-BE0C-F92BE3F3D2F2}" ProjectSection(SolutionItems) = preProject @@ -60,8 +63,14 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "duktape", "Source\3rdParty\duktape\duktape.vcxproj", "{E8D9A652-A354-4374-B6C5-A51EE62749FD}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64-video", "Source\Project64-video\Project64-video.vcxproj", "{A4D13408-A794-4199-8FC7-4A9A32505005}" + ProjectSection(ProjectDependencies) = postProject + {1968162C-0793-491D-91A1-81645A24D399} = {1968162C-0793-491D-91A1-81645A24D399} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64-audio", "Source\Project64-audio\Project64-audio.vcxproj", "{D233025A-231F-4A43-92B6-E87193C60ACC}" + ProjectSection(ProjectDependencies) = postProject + {1968162C-0793-491D-91A1-81645A24D399} = {1968162C-0793-491D-91A1-81645A24D399} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UpdateVersion", "Source\UpdateVersion\UpdateVersion.vcxproj", "{1968162C-0793-491D-91A1-81645A24D399}" EndProject diff --git a/Source/Project64-core/Version.h b/Source/Project64-core/Version.h deleted file mode 100644 index dfa89db07..000000000 --- a/Source/Project64-core/Version.h +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -* * -* Project64 - A Nintendo 64 emulator. * -* http://www.pj64-emu.com/ * -* Copyright (C) 2012 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) - -#ifdef ANDROID -#define VERSION_MAJOR 2 -#define VERSION_MINOR 3 -#define VERSION_REVISION 3 -#else -#define VERSION_MAJOR 2 -#define VERSION_MINOR 4 -#define VERSION_REVISION 0 -#endif -#define VERSION_BUILD 594 -#define GIT_VERSION "g169f9d9-dirty" - -#define VER_FILE_DESCRIPTION_STR "Project64" -#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" -#define VER_PRODUCT_VERSION VER_FILE_VERSION -#define VER_PRODUCT_VERSION_STR VER_FILE_VERSION_STR -#define VER_ORIGINAL_FILENAME_STR VER_PRODUCTNAME_STR ".exe" -#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_APP diff --git a/Source/Project64-video/Version.h b/Source/Project64-video/Version.h deleted file mode 100644 index ce2599321..000000000 --- a/Source/Project64-video/Version.h +++ /dev/null @@ -1,46 +0,0 @@ -/*************************************************************************** -* * -* Project64-video - A Nintendo 64 gfx plugin. * -* http://www.pj64-emu.com/ * -* Copyright (C) 2017 Project64. All rights reserved. * -* Copyright (C) 2003-2009 Sergey 'Gonetz' Lipski * -* Copyright (C) 2002 Dave2001 * -* * -* License: * -* GNU/GPLv2 http://www.gnu.org/licenses/gpl-2.0.html * -* version 2 of the License, or (at your option) any later version. * -* * -****************************************************************************/ -#define STRINGIZE2(s) #s -#define STRINGIZE(s) STRINGIZE2(s) - -#define VERSION_MAJOR 2 -#define VERSION_MINOR 2 -#define VERSION_REVISION 0 -#define VERSION_BUILD 594 -#define GIT_VERSION "g169f9d9-dirty" - -#define VER_FILE_DESCRIPTION_STR "Project64-video" -#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-video" -#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/RSP/Version.h b/Source/RSP/Version.h deleted file mode 100644 index e3e9ec206..000000000 --- a/Source/RSP/Version.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -* RSP Compiler plug in for Project64 (A Nintendo 64 emulator). -* -* (c) Copyright 2001 jabo (jabo@emulation64.com) and -* zilmar (zilmar@emulation64.com) -* -* pj64 homepage: www.pj64.net -* -* Permission to use, copy, modify and distribute Project64 in both binary and -* source form, for non-commercial purposes, is hereby granted without fee, -* providing that this license information and copyright notice appear with -* all copies and any derived work. -* -* This software is provided 'as-is', without any express or implied -* warranty. In no event shall the authors be held liable for any damages -* arising from the use of this software. -* -* Project64 is freeware for PERSONAL USE only. Commercial users should -* seek permission of the copyright holders first. Commercial use includes -* charging money for Project64 or software derived from Project64. -* -* The copyright holders request that bug fixes and improvements to the code -* should be forwarded to them so if they want them. -* -*/ - -#define STRINGIZE2(s) #s -#define STRINGIZE(s) STRINGIZE2(s) - -#define VERSION_MAJOR 1 -#define VERSION_MINOR 7 -#define VERSION_REVISION 4 -#define VERSION_BUILD 594 -#define GIT_VERSION "g169f9d9-dirty" - -#define VER_FILE_DESCRIPTION_STR "RSP emulation Plugin" -#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 "RSP" -#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/nragev20/Version.h b/Source/nragev20/Version.h deleted file mode 100644 index 80a1b9bdb..000000000 --- a/Source/nragev20/Version.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - N-Rage`s Dinput8 Plugin - (C) 2002, 2006 Norbert Wladyka - - Author`s Email: norbert.wladyka@chello.at - Website: http://go.to/nrage - - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ -#define STRINGIZE2(s) #s -#define STRINGIZE(s) STRINGIZE2(s) - -#define VERSION_MAJOR 2 -#define VERSION_MINOR 5 -#define VERSION_REVISION 3 -#define VERSION_BUILD 594 -#define GIT_VERSION "g169f9d9-dirty" - -#define VER_FILE_DESCRIPTION_STR "N-Rage for Project64" -#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 "N-Rage" -#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