diff --git a/rpcs3/Gui/AboutDialog.h b/rpcs3/Gui/AboutDialog.h index bee94e9b1a..8b7620af74 100644 --- a/rpcs3/Gui/AboutDialog.h +++ b/rpcs3/Gui/AboutDialog.h @@ -36,10 +36,10 @@ AboutDialog::AboutDialog(wxWindow *parent) t_descr->SetForegroundColour(wxColor(255,255,255)); t_descr->SetPosition(wxPoint(12,50)); -#ifdef _DEBUG - wxStaticText* t_version = new wxStaticText(this, wxID_ANY, wxString::Format("Version: " _PRGNAME_ " git-" RPCS3_GIT_VERSION)); +#ifdef WIN32 + wxStaticText* t_version = new wxStaticText(this, wxID_ANY, wxString::Format(_PRGNAME_" Version : " "git-" RPCS3_GIT_VERSION)); #else - wxStaticText* t_version = new wxStaticText(this, wxID_ANY, wxString::Format("Version: " _PRGNAME_ " " _PRGVER_)); + wxStaticText* t_version = new wxStaticText(this, wxID_ANY, wxString::Format(_PRGNAME_" Version : " _PRGVER_)); #endif t_version->SetBackgroundColour(wxColor(100,100,100)); t_version->SetForegroundColour(wxColor(200,200,200)); diff --git a/rpcs3/Gui/MainFrame.cpp b/rpcs3/Gui/MainFrame.cpp index 45c1a24f68..717f22fd49 100644 --- a/rpcs3/Gui/MainFrame.cpp +++ b/rpcs3/Gui/MainFrame.cpp @@ -70,8 +70,8 @@ MainFrame::MainFrame() , m_sys_menu_opened(false) { -#ifdef _DEBUG - SetLabel(wxString::Format(_PRGNAME_ " git-" RPCS3_GIT_VERSION)); +#ifdef WIN32 + SetLabel(wxString::Format(_PRGNAME_ " " RPCS3_GIT_VERSION)); #else SetLabel(wxString::Format(_PRGNAME_ " " _PRGVER_)); #endif diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index b3694d79b4..9f569766f2 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -1,10 +1,6 @@  - - Debug - LLVM - Win32 - Debug - LLVM x64 @@ -17,26 +13,14 @@ Debug - MemLeak x64 - - Debug - Win32 - Debug x64 - - Release - LLVM - Win32 - Release - LLVM x64 - - Release - Win32 - Release x64 @@ -57,14 +41,9 @@ - NotUsing NotUsing - NotUsing - NotUsing NotUsing NotUsing - NotUsing - NotUsing NotUsing NotUsing @@ -253,14 +232,9 @@ true - Create Create - Create - Create Create Create - Create - Create Create Create @@ -477,24 +451,6 @@ emucore - - StaticLibrary - true - v120 - Unicode - - - StaticLibrary - true - v120 - Unicode - - - StaticLibrary - true - v120 - Unicode - StaticLibrary true @@ -513,20 +469,6 @@ v120 Unicode - - StaticLibrary - false - v120 - false - Unicode - - - StaticLibrary - false - v120 - false - Unicode - StaticLibrary false @@ -544,15 +486,6 @@ - - - - - - - - - @@ -562,12 +495,6 @@ - - - - - - @@ -575,31 +502,6 @@ - - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - .\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - .\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - .\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - .\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - .\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath); - .\;..\;..\minidx9\Include;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);..\llvm\include;..\llvm_build\include $(Platform)\$(Configuration)\emucore\ @@ -630,43 +532,6 @@ $(LibraryPath) $(ExcludePath) - - - Level3 - Disabled - false - Use - stdafx.h - - - true - - - - - Level3 - Disabled - false - Use - stdafx.h - - - true - - - - - Level3 - Disabled - false - Use - _UNICODE;UNICODE;MSVC_CRT_MEMLEAK_DETECTION;%(PreprocessorDefinitions) - stdafx.h - - - true - - Level3 @@ -720,38 +585,6 @@ true - - - Level3 - MaxSpeed - true - true - false - Use - stdafx.h - - - true - true - true - - - - - Level3 - MaxSpeed - true - true - false - Use - stdafx.h - - - true - true - true - - Level3 diff --git a/rpcs3/git-version.h b/rpcs3/git-version.h deleted file mode 100644 index f770897486..0000000000 --- a/rpcs3/git-version.h +++ /dev/null @@ -1,6 +0,0 @@ -// This is a generated file. - -#define RPCS3_GIT_VERSION "unknown" - -// If you don't want this file to update/recompile, change to 1. -#define RPCS3_GIT_VERSION_NO_UPDATE 1 diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index 44c219a587..ade3c6121a 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -94,6 +94,7 @@ "$(SolutionDir)\Utilities\git-version-gen.cmd" + Updating git-version.h false @@ -120,6 +121,7 @@ "$(SolutionDir)\Utilities\git-version-gen.cmd" + Updating git-version.h false @@ -156,8 +158,8 @@ ..\wxWidgets\lib\vc_x64_lib;..\ffmpeg\Windows\x86_64\lib;..\OpenAL\Win64 - - + "$(SolutionDir)\Utilities\git-version-gen.cmd" + Updating git-version.h diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3.vcxproj.filters index 71062a8296..e55464ae48 100644 --- a/rpcs3/rpcs3.vcxproj.filters +++ b/rpcs3/rpcs3.vcxproj.filters @@ -194,5 +194,8 @@ Gui + + Gui + \ No newline at end of file