diff --git a/Project64.vs2013.sln b/Project64.vs2013.sln index 9232e4ce5..efd9aed01 100644 --- a/Project64.vs2013.sln +++ b/Project64.vs2013.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 +VisualStudioVersion = 12.0.21005.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd Party", "3rd Party", "{AA8F7F8E-5377-4911-859D-8A8817B0DB26}" EndProject @@ -41,6 +41,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glitch64", "Source\Glitch64 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GlideHQ", "Source\GlideHQ\GlideHQ.vcxproj", "{2DADDAA5-0F57-46ED-A974-747908DDC7F3}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PJ64 NRage", "Source\nragev20\NRage_Input_V2.vcxproj", "{FD617E80-9E40-4138-85DA-B94633972E6A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -110,6 +112,10 @@ Global {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|Win32.Build.0 = Debug|Win32 {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.ActiveCfg = Release|Win32 {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.Build.0 = Release|Win32 + {FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|Win32.ActiveCfg = Debug|Win32 + {FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|Win32.Build.0 = Debug|Win32 + {FD617E80-9E40-4138-85DA-B94633972E6A}.Release|Win32.ActiveCfg = Release|Win32 + {FD617E80-9E40-4138-85DA-B94633972E6A}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -119,12 +125,12 @@ Global {3326E128-33AF-422C-BB7C-67CC6B915610} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26} {4BC6906B-213E-40D7-9FC7-1A93E228393D} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26} {731BD205-2826-4631-B7AF-117658E88DBC} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26} - {A4D13408-A794-4199-8FC7-4A9A32505005} = {9FE699A5-41C3-4441-92AB-639B3D77DE26} {93447136-FACD-4740-8F35-FC46FB4A9E82} = {1379F817-7E3D-4F58-9C22-7E364E46E842} {427F1DCD-3BED-4010-9322-077A4C06D871} = {1379F817-7E3D-4F58-9C22-7E364E46E842} {93CFEDF3-9A75-4484-B169-D9D8074F5AC2} = {1379F817-7E3D-4F58-9C22-7E364E46E842} {05B9CB11-12D1-47CD-8E4A-88E12162119B} = {1379F817-7E3D-4F58-9C22-7E364E46E842} {25A25249-C284-4C5A-8DC2-26FC3EB13703} = {1379F817-7E3D-4F58-9C22-7E364E46E842} + {A4D13408-A794-4199-8FC7-4A9A32505005} = {9FE699A5-41C3-4441-92AB-639B3D77DE26} {462C2608-182F-452C-944F-AF201E19300B} = {9FE699A5-41C3-4441-92AB-639B3D77DE26} {2DADDAA5-0F57-46ED-A974-747908DDC7F3} = {9FE699A5-41C3-4441-92AB-639B3D77DE26} EndGlobalSection diff --git a/Source/Glide64/Glide64.rc b/Source/Glide64/Glide64.rc index a9c8d815e..ae5e7ef80 100644 --- a/Source/Glide64/Glide64.rc +++ b/Source/Glide64/Glide64.rc @@ -38,8 +38,13 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" - "\0" + "#include ""WinResrc.h""\r\n" + "\r\n" + "#ifdef IDC_STATIC\r\n" + "#undef IDC_STATIC\r\n" + "#endif\r\n" + "#define IDC_STATIC (-1)\r\n" + "\0" END 3 TEXTINCLUDE diff --git a/Source/Glide64/Version.h b/Source/Glide64/Version.h index b84eb0884..9046fdb27 100644 --- a/Source/Glide64/Version.h +++ b/Source/Glide64/Version.h @@ -23,7 +23,7 @@ #define VERSION_MAJOR 2 #define VERSION_MINOR 0 #define VERSION_REVISION 0 -#define VERSION_BUILD 1 +#define VERSION_BUILD 2 #define VER_FILE_DESCRIPTION_STR "Glide 64 for Project64" #define VER_FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD diff --git a/Source/Installer/package_zip.bat b/Source/Installer/package_zip.bat new file mode 100644 index 000000000..1f392fb98 --- /dev/null +++ b/Source/Installer/package_zip.bat @@ -0,0 +1,60 @@ +@echo off + +SET current_dir=%cd% +cd /d %~dp0..\..\ +SET base_dir=%cd% +cd /d %current_dir% + +mkdir "%base_dir%\Bin\Package" +mkdir "%base_dir%\Bin\Package\Config" +mkdir "%base_dir%\Bin\Package\Lang" +mkdir "%base_dir%\Bin\Package\Plugin" +mkdir "%base_dir%\Bin\Package\Plugin\Audio" +mkdir "%base_dir%\Bin\Package\Plugin\GFX" +mkdir "%base_dir%\Bin\Package\Plugin\Input" +mkdir "%base_dir%\Bin\Package\Plugin\RSP" + +copy "%base_dir%\Bin\Release\Project64.exe" "%base_dir%\Bin\Package" +copy "%base_dir%\Docs\Release Docs\PJgameFAQ.chm" "%base_dir%\Bin\Package" +copy "%base_dir%\Docs\Release Docs\Project64.chm" "%base_dir%\Bin\Package" +copy "%base_dir%\Config\Project64.cht" "%base_dir%\Bin\Package\Config" +copy "%base_dir%\Config\Project64.rdb" "%base_dir%\Bin\Package\Config" +copy "%base_dir%\Config\Project64.rdx" "%base_dir%\Bin\Package\Config" +copy "%base_dir%\Config\Glide64.rdb" "%base_dir%\Bin\Package\Config" +copy "%base_dir%\Lang\Brazilian Portuguese.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Bulgarian.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Chinese (Simplified).pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Chinese (Taiwan).pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Chinese (Traditional).pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\ChineseB5.pj.lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\ChineseGB.pj.lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Czech.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Danish.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Dutch.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\English.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\English_alternative.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Finnish.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\French.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\German.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\German_int.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\German_localised.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Greek.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Hungarian.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Italian.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Italian_alternative.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Japanese.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Lithuanian.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Norwegian.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Polish.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Russian.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Spanish (South America).pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Spanish (Spain).pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Spanish.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Swedish.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\T-Chinese.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Lang\Ukrainian.pj.Lang" "%base_dir%\Bin\Package\Lang" +copy "%base_dir%\Plugin\Audio\Jabo_Dsound.dll" "%base_dir%\Bin\Package\Plugin\Audio" +copy "%base_dir%\Plugin\GFX\Jabo_Direct3D8.dll" "%base_dir%\Bin\Package\Plugin\GFX" +copy "%base_dir%\Plugin\GFX\PJ64Glide64.dll" "%base_dir%\Bin\Package\Plugin\GFX" +copy "%base_dir%\Plugin\Input\PJ64_NRage.dll" "%base_dir%\Bin\Package\Plugin\Input" +copy "%base_dir%\Plugin\RSP\RSP 1.7.dll" "%base_dir%\Bin\Package\Plugin\RSP" diff --git a/Source/Project64/User Interface/UI Resources.rc b/Source/Project64/User Interface/UI Resources.rc index 8c473a0ba..a75559c2d 100644 --- a/Source/Project64/User Interface/UI Resources.rc +++ b/Source/Project64/User Interface/UI Resources.rc @@ -39,7 +39,12 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""WinResrc.h""\r\n" + "\r\n" + "#ifdef IDC_STATIC\r\n" + "#undef IDC_STATIC\r\n" + "#endif\r\n" + "#define IDC_STATIC (-1)\r\n" "\0" END diff --git a/Source/Project64/Version.h b/Source/Project64/Version.h index 4a9ba5221..b64dfbc73 100644 --- a/Source/Project64/Version.h +++ b/Source/Project64/Version.h @@ -12,9 +12,9 @@ #define STRINGIZE(s) STRINGIZE2(s) #define VERSION_MAJOR 2 -#define VERSION_MINOR 1 +#define VERSION_MINOR 2 #define VERSION_REVISION 0 -#define VERSION_BUILD 1 +#define VERSION_BUILD 0 #define VER_FILE_DESCRIPTION_STR "Project 64" #define VER_FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD diff --git a/Source/RSP/RSP.rc b/Source/RSP/RSP.rc index 1c7bfda50..40231b7eb 100644 --- a/Source/RSP/RSP.rc +++ b/Source/RSP/RSP.rc @@ -138,8 +138,13 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" - "\0" + "#include ""WinResrc.h""\r\n" + "\r\n" + "#ifdef IDC_STATIC\r\n" + "#undef IDC_STATIC\r\n" + "#endif\r\n" + "#define IDC_STATIC (-1)\r\n" + "\0" END 3 TEXTINCLUDE diff --git a/Source/RSP/Version.h b/Source/RSP/Version.h index ed940c023..6c0c02417 100644 --- a/Source/RSP/Version.h +++ b/Source/RSP/Version.h @@ -29,7 +29,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 7 #define VERSION_REVISION 0 -#define VERSION_BUILD 9 +#define VERSION_BUILD 10 #define VER_FILE_DESCRIPTION_STR "RSP emulation Plugin" #define VER_FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD diff --git a/Source/nragev20/NRagePluginV2.rc b/Source/nragev20/NRagePluginV2.rc index d47f92212..e00960840 100644 --- a/Source/nragev20/NRagePluginV2.rc +++ b/Source/nragev20/NRagePluginV2.rc @@ -7,7 +7,12 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "WinResrc.h" + +#ifdef IDC_STATIC +#undef IDC_STATIC +#endif +#define IDC_STATIC (-1) ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -578,7 +583,13 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\0" + "#include ""WinResrc.h""\r\n" + "\r\n" + "#ifdef IDC_STATIC\r\n" + "#undef IDC_STATIC\r\n" + "#endif\r\n" + "#define IDC_STATIC (-1)\r\n" + "\0" END 3 TEXTINCLUDE diff --git a/Source/nragev20/NRage_Input_V2.vcxproj b/Source/nragev20/NRage_Input_V2.vcxproj index ca7950473..c5ea6f9d3 100644 --- a/Source/nragev20/NRage_Input_V2.vcxproj +++ b/Source/nragev20/NRage_Input_V2.vcxproj @@ -13,6 +13,7 @@ {FD617E80-9E40-4138-85DA-B94633972E6A} NRage_Input_V2 + PJ64 NRage @@ -38,6 +39,14 @@ <_ProjectFileVersion>12.0.21005.1 + + $(SolutionDir)Plugin\Input\ + PJ64_NRage_d + + + PJ64_NRage + $(SolutionDir)Plugin\Input\ + $(Root)Source\3rd Party\directx\include;%(AdditionalIncludeDirectories) @@ -58,8 +67,8 @@ xinput.lib;dinput8.lib;dxguid.lib;Comctl32.lib;%(AdditionalDependencies) - $(Root)Plugin/Input/NRage_Input_V2.dll $(Root)Source\3rd Party\directx\lib;%(AdditionalLibraryDirectories) + false diff --git a/Source/nragev20/Version.h b/Source/nragev20/Version.h new file mode 100644 index 000000000..8d7f261d9 --- /dev/null +++ b/Source/nragev20/Version.h @@ -0,0 +1,53 @@ +/* + 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 4 +#define VERSION_REVISION 0 +#define VERSION_BUILD 0 + +#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) \ + +#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) 2015" + +#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