ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core: Add $(Platform) to the output directory

This commit is contained in:
zilmar 2024-09-05 17:54:58 +09:30
parent 00a92871c0
commit aaa6fc8082
30 changed files with 135 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
.gitignore vendored
View File

@ -20,11 +20,11 @@
Thumbs.db Thumbs.db
/.vs /.vs
/Bin/Debug
/Bin/Debug64
/Bin/Package /Bin/Package
/Bin/Release /Bin/Win32/Debug
/Bin/Release64 /Bin/Win32/Release
/Bin/x64/Debug
/Bin/x64/Release
/build /build
/Config/Cheats-User /Config/Cheats-User
/Config/Enhancements-User /Config/Enhancements-User
@ -36,35 +36,64 @@ Thumbs.db
/git.properties /git.properties
/ipch /ipch
/Package /Package
/Plugin/Audio/AndroidAudio_d.dll /Plugin/Win32/Audio/AndroidAudio_d.dll
/Plugin/Audio/AndroidAudio.dll /Plugin/Win32/Audio/AndroidAudio.dll
/Plugin/Audio/Project64-Audio_d.dll /Plugin/Win32/Audio/Project64-Audio_d.dll
/Plugin/Audio/Project64-Audio.dll /Plugin/Win32/Audio/Project64-Audio.dll
/Plugin/GFX/lib /Plugin/Win32/GFX/lib
/Plugin/GFX/map /Plugin/Win32/GFX/map
/Plugin/GFX/pdb /Plugin/Win32/GFX/pdb
/Plugin/GFX/Project64-Video_d.dll /Plugin/Win32/GFX/Project64-Video_d.dll
/Plugin/GFX/Project64-Video.dll /Plugin/Win32/GFX/Project64-Video.dll
/Plugin/Input/AndroidInput_d.dll /Plugin/Win32/Input/AndroidInput_d.dll
/Plugin/Input/AndroidInput.dll /Plugin/Win32/Input/AndroidInput.dll
/Plugin/Input/lib /Plugin/Win32/Input/lib
/Plugin/Input/map /Plugin/Win32/Input/map
/Plugin/Input/pdb /Plugin/Win32/Input/pdb
/Plugin/Input/PJ64_NRage_d.dll /Plugin/Win32/Input/PJ64_NRage_d.dll
/Plugin/Input/PJ64_NRage.dll /Plugin/Win32/Input/PJ64_NRage.dll
/Plugin/Input/Project64-Input_d.dll /Plugin/Win32/Input/Project64-Input_d.dll
/Plugin/Input/Project64-Input.dll /Plugin/Win32/Input/Project64-Input.dll
/Plugin/RSP/lib /Plugin/Win32/RSP/lib
/Plugin/RSP/map /Plugin/Win32/RSP/map
/Plugin/RSP/pdb /Plugin/Win32/RSP/pdb
/Plugin/RSP/Project64-RSP_d.dll /Plugin/Win32/RSP/Project64-RSP_d.dll
/Plugin/RSP/Project64-RSP.dll /Plugin/Win32/RSP/Project64-RSP.dll
/Plugin/RSP/RSP 1.7.dll /Plugin/Win32/RSP/RSP 1.7.dll
/Plugin/RSP/RSP_d 1.7.dll /Plugin/Win32/RSP/RSP_d 1.7.dll
/Plugin/RSP/RSP-HLE_d.dll /Plugin/Win32/RSP/RSP-HLE_d.dll
/Plugin/RSP/RSP-HLE.dll /Plugin/Win32/RSP/RSP-HLE.dll
/Plugin/RSP/Project64-RSP-Basic_d.dll /Plugin/Win32/RSP/Project64-RSP-Basic_d.dll
/Plugin/RSP/Project64-RSP-Basic.dll /Plugin/Win32/RSP/Project64-RSP-Basic.dll
/Plugin/x64/Audio/AndroidAudio_d.dll
/Plugin/x64/Audio/AndroidAudio.dll
/Plugin/x64/Audio/Project64-Audio_d.dll
/Plugin/x64/Audio/Project64-Audio.dll
/Plugin/x64/GFX/lib
/Plugin/x64/GFX/map
/Plugin/x64/GFX/pdb
/Plugin/x64/GFX/Project64-Video_d.dll
/Plugin/x64/GFX/Project64-Video.dll
/Plugin/x64/Input/AndroidInput_d.dll
/Plugin/x64/Input/AndroidInput.dll
/Plugin/x64/Input/lib
/Plugin/x64/Input/map
/Plugin/x64/Input/pdb
/Plugin/x64/Input/PJ64_NRage_d.dll
/Plugin/x64/Input/PJ64_NRage.dll
/Plugin/x64/Input/Project64-Input_d.dll
/Plugin/x64/Input/Project64-Input.dll
/Plugin/x64/RSP/lib
/Plugin/x64/RSP/map
/Plugin/x64/RSP/pdb
/Plugin/x64/RSP/Project64-RSP_d.dll
/Plugin/x64/RSP/Project64-RSP.dll
/Plugin/x64/RSP/RSP 1.7.dll
/Plugin/x64/RSP/RSP_d 1.7.dll
/Plugin/x64/RSP/RSP-HLE_d.dll
/Plugin/x64/RSP/RSP-HLE.dll
/Plugin/x64/RSP/Project64-RSP-Basic_d.dll
/Plugin/x64/RSP/Project64-RSP-Basic.dll
/Plugin64/AndroidAudio /Plugin64/AndroidAudio
/Plugin64/Audio/AndroidAudio_d.dll /Plugin64/Audio/AndroidAudio_d.dll
/Plugin64/Audio/AndroidAudio.dll /Plugin64/Audio/AndroidAudio.dll

2
Bin/Debug/Config/Project64.cfg
View File

@ -1,2 +0,0 @@
[Settings]
ConfigFile=..\..\Config\Project64.cfg

2
Bin/Debug64/Config/Project64.cfg
View File

@ -1,2 +0,0 @@
[Settings]
ConfigFile=..\..\Config\Project64.cfg

2
Bin/Release/Config/Project64.cfg
View File

@ -1,2 +0,0 @@
[Settings]
ConfigFile=..\..\Config\Project64.cfg

2
Bin/Release64/Config/Project64.cfg
View File

@ -1,2 +0,0 @@
[Settings]
ConfigFile=..\..\Config\Project64.cfg

2
Bin/Win32/Debug/Config/Project64.cfg Normal file
View File

@ -0,0 +1,2 @@
[Settings]
ConfigFile=..\..\..\Config\Project64.cfg

2
Bin/Win32/Release/Config/Project64.cfg Normal file
View File

@ -0,0 +1,2 @@
[Settings]
ConfigFile=..\..\..\Config\Project64.cfg

2
Bin/x64/Debug/Config/Project64.cfg Normal file
View File

@ -0,0 +1,2 @@
[Settings]
ConfigFile=..\..\..\Config\Project64.cfg

2
Bin/x64/Release64/Config/Project64.cfg Normal file
View File

@ -0,0 +1,2 @@
[Settings]
ConfigFile=..\Config\Project64.cfg

37
Config/Project64.cfg.development
View File

@ -1,41 +1,38 @@
[Settings] [Settings]
7zipCache=..\..\Config\Project64.zcache 7zipCache=..\..\..\Config\Project64.zcache
AudioRDB=..\..\Config\Audio.rdb AudioRDB=..\..\..\Config\Audio.rdb
Auto Sleep=0 Auto Sleep=0
Basic Mode=0 Basic Mode=0
CheatDir=..\..\Config\Cheats\ CheatDir=..\..\..\Config\Cheats\
EnhancementDir=..\..\Config\Enhancements\ EnhancementDir=..\..\..\Config\Enhancements\
ExtInfo=..\..\Config\Project64.rdx ExtInfo=..\..\..\Config\Project64.rdx
Notes=..\..\Config\Project64.rdn Notes=..\..\..\Config\Project64.rdn
RomDatabase=..\..\Config\Project64.rdb RomDatabase=..\..\..\Config\Project64.rdb
RomListCache=..\..\Config\Project64.cache3 RomListCache=..\..\..\Config\Project64.cache3
ShortCuts=..\..\Config\Project64.sc3 ShortCuts=..\..\..\Config\Project64.sc3
UserCheatDir=..\..\Config\Cheats-User\ UserCheatDir=..\..\Config\Cheats-User\
UserEnhancementDir=..\..\Config\Enhancements-User\ UserEnhancementDir=..\..\..\Config\Enhancements-User\
VideoRDB=..\..\Config\Video.rdb VideoRDB=..\..\..\Config\Video.rdb
[Debugger] [Debugger]
Debugger=1 Debugger=1
[Plugin Directory] [Plugin Directory]
Directory=..\..\Plugin\ Directory-x86=..\..\..\Plugin\Win32\
Use Selected=1 Directory-x64=..\..\..\Plugin\x64\
[Plugin64 Directory]
Directory=..\..\Plugin64\
Use Selected=1 Use Selected=1
[Native Save Directory] [Native Save Directory]
Directory=..\..\Save\ Directory=..\..\..\Save\
Use Selected=1 Use Selected=1
[Instant Save Directory] [Instant Save Directory]
Directory=..\..\Save\ Directory=..\..\..\Save\
Use Selected=1 Use Selected=1
[Lang Directory] [Lang Directory]
Directory=..\..\Lang Directory=..\..\..\Lang
[Texture Directory] [Texture Directory]
Directory=..\..\Textures\ Directory=..\..\..\Textures\
Use Selected=1 Use Selected=1

0
Plugin/Audio/Jabo_Dsound.dll → Plugin/Win32/Audio/Jabo_Dsound.dll
View File

0
Plugin/GFX/Jabo_Direct3D8.dll → Plugin/Win32/GFX/Jabo_Direct3D8.dll
View File

15
PropertySheets/Platform.props
View File

@ -13,8 +13,8 @@
<!-- All platforms settings --> <!-- All platforms settings -->
<PropertyGroup> <PropertyGroup>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)build\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(SolutionDir)build\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<ExtensionsToDeleteOnClean>*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath);$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean> <ExtensionsToDeleteOnClean>*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath);$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
<IgnoreImportLibrary>false</IgnoreImportLibrary> <IgnoreImportLibrary>false</IgnoreImportLibrary>
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
@ -22,7 +22,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(ConfigurationType)'=='StaticLibrary'"> <PropertyGroup Condition="'$(ConfigurationType)'=='StaticLibrary'">
<OutDir>$(SolutionDir)bin\$(Configuration)\lib\</OutDir> <OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\lib\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
@ -206,15 +206,6 @@
<!-- END Win32 --> <!-- END Win32 -->
<!-- x64 --> <!-- x64 -->
<PropertyGroup Condition="'$(Platform)'=='x64'">
<OutDir>$(SolutionDir)bin\$(Configuration)64\</OutDir>
<IntDir>$(SolutionDir)build\$(Configuration)64\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(ConfigurationType)|$(Platform)'=='StaticLibrary|x64'">
<OutDir>$(SolutionDir)bin\$(Configuration)64\lib\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Platform)'=='x64'"> <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
<Lib> <Lib>
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>

3
Source/Android/PluginInput/PluginInput.vcxproj
View File

@ -27,8 +27,7 @@
<PropertyGroup> <PropertyGroup>
<TargetName>AndroidInput</TargetName> <TargetName>AndroidInput</TargetName>
<TargetName Condition="'$(Configuration)'=='Debug'">AndroidInput_d</TargetName> <TargetName Condition="'$(Configuration)'=='Debug'">AndroidInput_d</TargetName>
<OutDir>$(SolutionDir)Plugin\Input\</OutDir> <OutDir>$(SolutionDir)Plugin\$(Platform)\Input\</OutDir>
<OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)Plugin64\Input\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>

3
Source/Android/PluginRSP/PluginRSP.vcxproj
View File

@ -34,8 +34,7 @@
<PropertyGroup> <PropertyGroup>
<TargetName>Project64-RSP-Basic</TargetName> <TargetName>Project64-RSP-Basic</TargetName>
<TargetName Condition="'$(Configuration)'=='Debug'">Project64-RSP-Basic_d</TargetName> <TargetName Condition="'$(Configuration)'=='Debug'">Project64-RSP-Basic_d</TargetName>
<OutDir>$(SolutionDir)Plugin\RSP\</OutDir> <OutDir>$(SolutionDir)Plugin\$(Platform)\RSP\</OutDir>
<OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)Plugin64\RSP\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>

3
Source/Common/path.cpp
View File

@ -1422,7 +1422,7 @@ bool CPath::ChangeDirectory()
#endif #endif
} }
void CPath::NormalizePath(CPath BaseDir) CPath & CPath::NormalizePath(CPath BaseDir)
{ {
#ifdef _WIN32 #ifdef _WIN32
stdstr Directory = BaseDir.GetDriveDirectory(); stdstr Directory = BaseDir.GetDriveDirectory();
@ -1467,6 +1467,7 @@ void CPath::NormalizePath(CPath BaseDir)
SetDirectory(Directory.c_str()); SetDirectory(Directory.c_str());
#endif #endif
} }
return *this;
} }
// Pre: If bCreateIntermediates is TRUE, create all eventually missing parent directories too // Pre: If bCreateIntermediates is TRUE, create all eventually missing parent directories too

2
Source/Common/path.h
View File

@ -147,7 +147,7 @@ public:
// Directory operations // Directory operations
bool DirectoryCreate(bool bCreateIntermediates = true); bool DirectoryCreate(bool bCreateIntermediates = true);
bool ChangeDirectory(); bool ChangeDirectory();
void NormalizePath(CPath BaseDir); CPath & NormalizePath(CPath BaseDir);
// File operations // File operations
bool Delete(bool bEvenIfReadOnly = true) const; bool Delete(bool bEvenIfReadOnly = true) const;

22
Source/Installer/Installer.iss
View File

@ -5,11 +5,11 @@
AppId={{BEB5FB69-4080-466F-96C4-F15DF271718B} AppId={{BEB5FB69-4080-466F-96C4-F15DF271718B}
AppName=Project64 AppName=Project64
AppVersion={#AppVersion} AppVersion={#AppVersion}
DefaultDirName={pf32}\Project64 Dev 3.0 DefaultDirName={pf32}\Project64 Dev 4.0
VersionInfoVersion={#AppVersion} VersionInfoVersion={#AppVersion}
OutputDir={#BaseDir}\Bin\{#Configuration} OutputDir={#BaseDir}\Bin\{#Configuration}
OutputBaseFilename=Setup Project64 Dev 3.0 OutputBaseFilename=Setup Project64 Dev 4.0
VersionInfoDescription=Installation Setup of Project64 Dev 3.0 VersionInfoDescription=Installation Setup of Project64 Dev 4.0
Compression=lzma2/ultra64 Compression=lzma2/ultra64
WizardImageFile=Installer-Sidebar.bmp WizardImageFile=Installer-Sidebar.bmp
WizardSmallImageFile=Pj64LogoSmallImage.bmp WizardSmallImageFile=Pj64LogoSmallImage.bmp
@ -31,14 +31,14 @@ Source: "{#BaseDir}\Config\Enhancements\*.enh"; DestDir: "{app}\Config\Enhanceme
Source: "{#BaseDir}\Config\Project64.rdb"; DestDir: "{app}\Config" Source: "{#BaseDir}\Config\Project64.rdb"; DestDir: "{app}\Config"
Source: "{#BaseDir}\Config\Project64.rdx"; DestDir: "{app}\Config" Source: "{#BaseDir}\Config\Project64.rdx"; DestDir: "{app}\Config"
Source: "{#BaseDir}\Lang\*.pj.Lang"; DestDir: "{app}\Lang" Source: "{#BaseDir}\Lang\*.pj.Lang"; DestDir: "{app}\Lang"
Source: "{#BaseDir}\Plugin\Audio\Jabo_Dsound.dll"; DestDir: "{app}\Plugin\Audio" Source: "{#BaseDir}\Plugin\{#Configuration}\Audio\Jabo_Dsound.dll"; DestDir: "{app}\Plugin\Audio"
Source: "{#BaseDir}\Plugin\Audio\Project64-Audio.dll"; DestDir: "{app}\Plugin\Audio" Source: "{#BaseDir}\Plugin\{#Configuration}\Audio\Project64-Audio.dll"; DestDir: "{app}\Plugin\Audio"
Source: "{#BaseDir}\Plugin\GFX\Jabo_Direct3D8.dll"; DestDir: "{app}\Plugin\GFX" Source: "{#BaseDir}\Plugin\{#Configuration}\GFX\Jabo_Direct3D8.dll"; DestDir: "{app}\Plugin\GFX"
Source: "{#BaseDir}\Plugin\GFX\Project64-Video.dll"; DestDir: "{app}\Plugin\GFX" Source: "{#BaseDir}\Plugin\{#Configuration}\GFX\Project64-Video.dll"; DestDir: "{app}\Plugin\GFX"
Source: "{#BaseDir}\Plugin\GFX\GLideN64\*"; DestDir: "{app}\Plugin\GFX\GLideN64"; Flags: recursesubdirs skipifsourcedoesntexist Source: "{#BaseDir}\Plugin\{#Configuration}\GFX\GLideN64\*"; DestDir: "{app}\Plugin\GFX\GLideN64"; Flags: recursesubdirs skipifsourcedoesntexist
Source: "{#BaseDir}\Plugin\Input\PJ64_NRage.dll"; DestDir: "{app}\Plugin\Input" Source: "{#BaseDir}\Plugin\{#Configuration}\Input\PJ64_NRage.dll"; DestDir: "{app}\Plugin\Input"
Source: "{#BaseDir}\Plugin\Input\Project64-Input.dll"; DestDir: "{app}\Plugin\Input" Source: "{#BaseDir}\Plugin\{#Configuration}\Input\Project64-Input.dll"; DestDir: "{app}\Plugin\Input"
Source: "{#BaseDir}\Plugin\RSP\Project64-RSP.dll"; DestDir: "{app}\Plugin\RSP" Source: "{#BaseDir}\Plugin\{#Configuration}\RSP\Project64-RSP.dll"; DestDir: "{app}\Plugin\RSP"
Source: "{#BaseDir}\Scripts\example.js"; DestDir: "{app}\Scripts" Source: "{#BaseDir}\Scripts\example.js"; DestDir: "{app}\Scripts"
Source: "{#BaseDir}\Scripts\api_documentation.js"; DestDir: "{app}\Scripts" Source: "{#BaseDir}\Scripts\api_documentation.js"; DestDir: "{app}\Scripts"
Source: "{#BaseDir}\JS-API-Documentation.html"; DestDir: "{app}" Source: "{#BaseDir}\JS-API-Documentation.html"; DestDir: "{app}"

3
Source/Project64-audio/Project64-audio.vcxproj
View File

@ -35,8 +35,7 @@
<PropertyGroup> <PropertyGroup>
<TargetName>Project64-Audio</TargetName> <TargetName>Project64-Audio</TargetName>
<TargetName Condition="'$(Configuration)'=='Debug'">Project64-Audio_d</TargetName> <TargetName Condition="'$(Configuration)'=='Debug'">Project64-Audio_d</TargetName>
<OutDir>$(SolutionDir)Plugin\Audio\</OutDir> <OutDir>$(SolutionDir)Plugin\$(Platform)\Audio\</OutDir>
<OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)Plugin64\Audio\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>

4
Source/Project64-core/AppInit.cpp
View File

@ -247,14 +247,14 @@ bool AppInit(CNotification * Notify, const char * BaseDirectory, int argc, char
#ifdef _WIN32 #ifdef _WIN32
IncreaseThreadPriority(); IncreaseThreadPriority();
#endif #endif
g_Lang = new CLanguage();
g_Lang->LoadCurrentStrings();
g_Enhancements = new CEnhancements(); g_Enhancements = new CEnhancements();
//Create the plugin container //Create the plugin container
WriteTrace(TraceAppInit, TraceInfo, "Create plugins"); WriteTrace(TraceAppInit, TraceInfo, "Create plugins");
g_Plugins = new CPlugins(Directory_Plugin, false); g_Plugins = new CPlugins(Directory_Plugin, false);
g_Lang = new CLanguage();
g_Lang->LoadCurrentStrings();
g_Notify->AppInitDone(); g_Notify->AppInitDone();
WriteTrace(TraceAppInit, TraceDebug, "Initialized successfully"); WriteTrace(TraceAppInit, TraceDebug, "Initialized successfully");
return true; return true;

1
Source/Project64-core/Multilanguage/Language.cpp
View File

@ -652,6 +652,7 @@ LanguageList & CLanguage::GetLangList(void)
} }
CPath LanguageFiles(g_Settings->LoadStringVal(Setting_LanguageDir), "*.pj.Lang"); CPath LanguageFiles(g_Settings->LoadStringVal(Setting_LanguageDir), "*.pj.Lang");
LanguageFiles.NormalizePath(CPath(CPath::MODULE_DIRECTORY, ""));
if (LanguageFiles.FindFirst()) if (LanguageFiles.FindFirst())
{ {
do do

1
Source/Project64-core/Plugins/Plugin.cpp
View File

@ -17,6 +17,7 @@ CPlugins::CPlugins(SettingID PluginDirSetting, bool SyncPlugins) :
m_initilized(false), m_initilized(false),
m_SyncPlugins(SyncPlugins) m_SyncPlugins(SyncPlugins)
{ {
m_PluginDir = (const std::string &)((CPath(m_PluginDir, "").NormalizePath(CPath(CPath::MODULE_DIRECTORY))));
CreatePlugins(); CreatePlugins();
g_Settings->RegisterChangeCB(Plugin_RSP_Current, this, (CSettings::SettingChangedFunc)PluginChanged); g_Settings->RegisterChangeCB(Plugin_RSP_Current, this, (CSettings::SettingChangedFunc)PluginChanged);
g_Settings->RegisterChangeCB(Plugin_GFX_Current, this, (CSettings::SettingChangedFunc)PluginChanged); g_Settings->RegisterChangeCB(Plugin_GFX_Current, this, (CSettings::SettingChangedFunc)PluginChanged);

14
Source/Project64-core/RomList/RomList.cpp
View File

@ -41,11 +41,17 @@ CRomList::CRomList() :
WriteTrace(TraceRomList, TraceVerbose, "Start"); WriteTrace(TraceRomList, TraceVerbose, "Start");
if (g_Settings) if (g_Settings)
{ {
m_NotesIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_Notes).c_str()); CPath ModuleDir(CPath::MODULE_DIRECTORY);
m_ExtIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_ExtInfo).c_str()); CPath NotesFile = CPath(g_Settings->LoadStringVal(SupportFile_Notes)).NormalizePath(ModuleDir);
m_RomIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_RomDatabase).c_str()); CPath ExtInfo = CPath(g_Settings->LoadStringVal(SupportFile_ExtInfo)).NormalizePath(ModuleDir);
CPath RomDatabase = CPath(g_Settings->LoadStringVal(SupportFile_RomDatabase)).NormalizePath(ModuleDir);
CPath ZipCache = CPath(g_Settings->LoadStringVal(RomList_7zipCache)).NormalizePath(ModuleDir);
m_NotesIniFile = new CIniFile(NotesFile);
m_ExtIniFile = new CIniFile(ExtInfo);
m_RomIniFile = new CIniFile(RomDatabase);
#ifdef _WIN32 #ifdef _WIN32
m_ZipIniFile = new CIniFile(g_Settings->LoadStringVal(RomList_7zipCache).c_str()); m_ZipIniFile = new CIniFile(ZipCache);
#endif #endif
g_Settings->RegisterChangeCB(RomList_GameDir, this, (CSettings::SettingChangedFunc)RefreshSettings); g_Settings->RegisterChangeCB(RomList_GameDir, this, (CSettings::SettingChangedFunc)RefreshSettings);
} }

23
Source/Project64-core/Settings.cpp
View File

@ -251,25 +251,16 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory)
AddHandler(UserInterface_DisplayFrameRate, new CSettingTypeApplication("Settings", "Display Frame Rate", (uint32_t) false)); AddHandler(UserInterface_DisplayFrameRate, new CSettingTypeApplication("Settings", "Display Frame Rate", (uint32_t) false));
AddHandler(UserInterface_FrameDisplayType, new CSettingTypeApplication("Settings", "Frame Rate Display Type", (uint32_t)FR_VIs)); AddHandler(UserInterface_FrameDisplayType, new CSettingTypeApplication("Settings", "Frame Rate Display Type", (uint32_t)FR_VIs));
AddHandler(Directory_Plugin, new CSettingTypeSelectedDirectory("Dir:Plugin", Directory_PluginInitial, Directory_PluginSelected, Directory_PluginUseSelected, Directory_Plugin)); AddHandler(Directory_Plugin, new CSettingTypeSelectedDirectory("Dir:Plugin", Directory_PluginInitial, Directory_PluginSelected, Directory_PluginUseSelected, Directory_Plugin));
#ifndef _M_X64
AddHandler(Directory_PluginInitial, new CSettingTypeRelativePath("Plugin", "")); AddHandler(Directory_PluginInitial, new CSettingTypeRelativePath("Plugin", ""));
AddHandler(Directory_PluginSelected, new CSettingTypeApplicationPath("Plugin Directory", "Directory", Directory_PluginInitial));
AddHandler(Directory_PluginUseSelected, new CSettingTypeApplication("Plugin Directory", "Use Selected", false));
AddHandler(Directory_PluginSyncInitial, new CSettingTypeRelativePath("SyncPlugin", "")); AddHandler(Directory_PluginSyncInitial, new CSettingTypeRelativePath("SyncPlugin", ""));
AddHandler(Directory_PluginSyncSelected, new CSettingTypeApplicationPath("Sync Plugin Directory", "Directory", Directory_PluginInitial)); AddHandler(Directory_PluginUseSelected, new CSettingTypeApplication("Plugin Directory", "Use Selected", false));
AddHandler(Directory_PluginSyncUseSelected, new CSettingTypeApplication("Sync Plugin Directory", "Use Selected", false)); AddHandler(Directory_PluginSyncUseSelected, new CSettingTypeApplication("Sync Plugin Directory", "Use Selected", false));
#if (defined(__i386__) || defined(_M_IX86))
#else AddHandler(Directory_PluginSelected, new CSettingTypeApplicationPath("Plugin Directory", "Directory-x86", Directory_PluginInitial));
AddHandler(Directory_PluginInitial, new CSettingTypeRelativePath("Plugin64", "")); AddHandler(Directory_PluginSyncSelected, new CSettingTypeApplicationPath("Plugin Directory", "Sync Directory-x86", Directory_PluginInitial));
AddHandler(Directory_PluginSelected, new CSettingTypeApplicationPath("Plugin64 Directory", "Directory", Directory_PluginInitial)); #elif (defined(__amd64__) || defined(_M_X64))
AddHandler(Directory_PluginUseSelected, new CSettingTypeApplication("Plugin64 Directory", "Use Selected", false)); AddHandler(Directory_PluginSelected, new CSettingTypeApplicationPath("Plugin Directory", "Directory-x64", Directory_PluginInitial));
AddHandler(Directory_PluginSync, new CSettingTypeRelativePath("SyncPlugin64", "")); AddHandler(Directory_PluginSyncSelected, new CSettingTypeApplicationPath("Plugin Directory", "Sync Directory-x64", Directory_PluginInitial));
AddHandler(Directory_PluginSyncInitial, new CSettingTypeRelativePath("SyncPlugin64", ""));
AddHandler(Directory_PluginSyncSelected, new CSettingTypeApplicationPath("Sync Plugin Directory64", "Directory", Directory_PluginInitial));
AddHandler(Directory_PluginSyncUseSelected, new CSettingTypeApplication("Sync Plugin Directory64", "Use Selected", false));
#endif #endif
AddHandler(Directory_PluginSync, new CSettingTypeSelectedDirectory("Dir:SyncPlugin", Directory_PluginSyncInitial, Directory_PluginSyncSelected, Directory_PluginSyncUseSelected, Directory_PluginSync)); AddHandler(Directory_PluginSync, new CSettingTypeSelectedDirectory("Dir:SyncPlugin", Directory_PluginSyncInitial, Directory_PluginSyncSelected, Directory_PluginSyncUseSelected, Directory_PluginSync));

3
Source/Project64-input/Project64-input.vcxproj
View File

@ -35,8 +35,7 @@
<PropertyGroup> <PropertyGroup>
<TargetName>Project64-Input</TargetName> <TargetName>Project64-Input</TargetName>
<TargetName Condition="'$(Configuration)'=='Debug'">Project64-Input_d</TargetName> <TargetName Condition="'$(Configuration)'=='Debug'">Project64-Input_d</TargetName>
<OutDir>$(SolutionDir)Plugin\Input\</OutDir> <OutDir>$(SolutionDir)Plugin\$(Platform)\Input\</OutDir>
<OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)Plugin64\Input\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>

3
Source/Project64-rsp/Project64-rsp.vcxproj
View File

@ -34,8 +34,7 @@
<PropertyGroup> <PropertyGroup>
<TargetName>Project64-RSP</TargetName> <TargetName>Project64-RSP</TargetName>
<TargetName Condition="'$(Configuration)'=='Debug'">Project64-RSP_d</TargetName> <TargetName Condition="'$(Configuration)'=='Debug'">Project64-RSP_d</TargetName>
<OutDir>$(SolutionDir)Plugin\RSP\</OutDir> <OutDir>$(SolutionDir)Plugin\$(Platform)\RSP\</OutDir>
<OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)Plugin64\RSP\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>

3
Source/Project64-video/Project64-video.vcxproj
View File

@ -34,8 +34,7 @@
<PropertyGroup> <PropertyGroup>
<TargetName>Project64-Video</TargetName> <TargetName>Project64-Video</TargetName>
<TargetName Condition="'$(Configuration)'=='Debug'">Project64-Video_d</TargetName> <TargetName Condition="'$(Configuration)'=='Debug'">Project64-Video_d</TargetName>
<OutDir>$(SolutionDir)Plugin\GFX\</OutDir> <OutDir>$(SolutionDir)Plugin\$(Platform)\GFX\</OutDir>
<OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)Plugin64\GFX\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>

1
Source/Project64/Plugins/PluginList.cpp
View File

@ -7,6 +7,7 @@
CPluginList::CPluginList(bool bAutoFill /* = true */) : CPluginList::CPluginList(bool bAutoFill /* = true */) :
m_PluginDir(g_Settings->LoadStringVal(Directory_Plugin), "") m_PluginDir(g_Settings->LoadStringVal(Directory_Plugin), "")
{ {
m_PluginDir.NormalizePath(CPath(CPath::MODULE_DIRECTORY));
if (bAutoFill) if (bAutoFill)
{ {
LoadList(); LoadList();

6
Source/Script/UpdateVersion.cmd
View File

@ -16,7 +16,5 @@ if not "%~2" == "" set Platform=%~2
if not "%~2" == "" set InFile="%~3" if not "%~2" == "" set InFile="%~3"
if not "%~3" == "" set OutFile="%~4" if not "%~3" == "" set OutFile="%~4"
if %Platform%==x64 set BuildMode=%BuildMode%64 echo "%base_dir%\Bin\%Platform%\%BuildMode%\UpdateVersion.exe" %InFile% %OutFile%
"%base_dir%\Bin\%Platform%\%BuildMode%\UpdateVersion.exe" %InFile% %OutFile%
echo "%base_dir%\Bin\%BuildMode%\UpdateVersion.exe" %InFile% %OutFile%
"%base_dir%\Bin\%BuildMode%\UpdateVersion.exe" %InFile% %OutFile%

3
Source/nragev20/NRage_Input_V2.vcxproj
View File

@ -35,8 +35,7 @@
<PropertyGroup> <PropertyGroup>
<TargetName>PJ64_NRage</TargetName> <TargetName>PJ64_NRage</TargetName>
<TargetName Condition="'$(Configuration)'=='Debug'">PJ64_NRage_d</TargetName> <TargetName Condition="'$(Configuration)'=='Debug'">PJ64_NRage_d</TargetName>
<OutDir>$(SolutionDir)Plugin\Input\</OutDir> <OutDir>$(SolutionDir)Plugin\$(Platform)\Input\</OutDir>
<OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)Plugin64\Input\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>