diff --git a/Source/Glide64/Glide64.rc b/Source/Glide64/Glide64.rc index f86976a7d..a9c8d815e 100644 --- a/Source/Glide64/Glide64.rc +++ b/Source/Glide64/Glide64.rc @@ -2,6 +2,8 @@ // #include "resource.h" +#include "Version.h" + #define APSTUDIO_READONLY_SYMBOLS #include "WinResrc.h" @@ -67,34 +69,30 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,0,1 - PRODUCTVERSION 2,0,0,1 - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEVERSION VER_FILE_VERSION + PRODUCTVERSION VER_PRODUCT_VERSION + FILEFLAGSMASK 0x1fL + FILEFLAGS VER_FILEFLAGS + FILEOS VER_FILEOS + FILETYPE VER_FILETYPE + FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" BEGIN - BLOCK "0c0904b0" + BLOCK "040904b0" BEGIN - VALUE "FileDescription", "Glide 64 for Project64" - VALUE "FileVersion", "2, 0, 0, 1" - VALUE "InternalName", "Glide64" - VALUE "LegalCopyright", "Copyright (C) 2013" - VALUE "OriginalFilename", "Glide64.dll" - VALUE "ProductName", "Glide 64 for Project64" - VALUE "ProductVersion", "2, 0, 0, 1" + VALUE "FileDescription", VER_FILE_DESCRIPTION_STR "\0" + VALUE "FileVersion", VER_FILE_VERSION_STR "\0" + VALUE "InternalName", VER_INTERNAL_NAME_STR "\0" + VALUE "LegalCopyright", VER_COPYRIGHT_STR "\0" + VALUE "OriginalFilename", VER_ORIGINAL_FILENAME_STR "\0" + VALUE "ProductName", VER_PRODUCTNAME_STR + VALUE "ProductVersion", VER_PRODUCT_VERSION_STR "\0" END END BLOCK "VarFileInfo" BEGIN - VALUE "Translation", 0xc09, 1200 + VALUE "Translation", 0x409, 1200 END END diff --git a/Source/Glide64/Glide64.vcxproj b/Source/Glide64/Glide64.vcxproj index a258c7311..6468594a0 100644 --- a/Source/Glide64/Glide64.vcxproj +++ b/Source/Glide64/Glide64.vcxproj @@ -110,6 +110,7 @@ + diff --git a/Source/Glide64/Glide64.vcxproj.filters b/Source/Glide64/Glide64.vcxproj.filters index 405f40d56..3641fcf10 100644 --- a/Source/Glide64/Glide64.vcxproj.filters +++ b/Source/Glide64/Glide64.vcxproj.filters @@ -127,6 +127,7 @@ + diff --git a/Source/Glide64/Main.cpp b/Source/Glide64/Main.cpp index 09ecd45f5..094724e17 100644 --- a/Source/Glide64/Main.cpp +++ b/Source/Glide64/Main.cpp @@ -38,7 +38,8 @@ //**************************************************************** #include "Gfx #1.3.h" -#include +#include "Version.h" +#include #include #include @@ -1459,9 +1460,9 @@ void CALL GetDllInfo ( PLUGIN_INFO * PluginInfo ) PluginInfo->Version = 0x0104; // Set to 0x0104 PluginInfo->Type = PLUGIN_TYPE_GFX; // Set to PLUGIN_TYPE_GFX #ifdef _DEBUG - sprintf(PluginInfo->Name,"Glide64 For PJ64 (Debug): %s",VersionInfo(VERSION_PRODUCT_VERSION,hinstDLL).c_str()); + sprintf(PluginInfo->Name, "Glide64 For PJ64 (Debug): %s", VER_FILE_VERSION_STR); #else - sprintf(PluginInfo->Name,"Glide64 For PJ64: %s",VersionInfo(VERSION_PRODUCT_VERSION,hinstDLL).c_str()); + sprintf(PluginInfo->Name,"Glide64 For PJ64: %s", VER_FILE_VERSION_STR); #endif // If DLL supports memory these memory options then set them to TRUE or FALSE diff --git a/Source/Glide64/Version.h b/Source/Glide64/Version.h new file mode 100644 index 000000000..b84eb0884 --- /dev/null +++ b/Source/Glide64/Version.h @@ -0,0 +1,50 @@ +/* +* Glide64 - Glide video plugin for Nintendo 64 emulators. +* Copyright (c) 2002 Dave2001 +* Copyright (c) 2003-2009 Sergey 'Gonetz' Lipski +* +* 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 +* 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 0 +#define VERSION_REVISION 0 +#define VERSION_BUILD 1 + +#define VER_FILE_DESCRIPTION_STR "Glide 64 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) \ + +#define VER_PRODUCTNAME_STR "Glide64" +#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) 2013" + +#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