Skip to content

Commit fab6951

Browse files
committed
Fix dpi awareness error; Enable program debug information on msvc
1 parent 12da498 commit fab6951

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

rpcs3/main.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
#include <QDebug>
66
#include <QDesktopWidget>
77
#include "rpcs3_app.h"
8+
#ifdef _WIN32
9+
#include <windows.h>
10+
#endif
811

912
int main(int argc, char** argv)
1013
{

rpcs3/rpcs3qt.vcxproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
<AdditionalOptions>-Zc:strictStrings -Zc:throwingNew -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)</AdditionalOptions>
129129
<AssemblerListingLocation>release\</AssemblerListingLocation>
130130
<BrowseInformation>false</BrowseInformation>
131-
<DebugInformationFormat>None</DebugInformationFormat>
131+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
132132
<DisableSpecificWarnings>4577;4467;%(DisableSpecificWarnings)</DisableSpecificWarnings>
133133
<ExceptionHandling>Sync</ExceptionHandling>
134134
<ObjectFileName>$(IntDir)</ObjectFileName>
@@ -147,7 +147,7 @@
147147
<AdditionalLibraryDirectories>..\3rdparty\OpenAL\libs\Win64;..\Vulkan\glslang-build\hlsl\Release;..\Vulkan\glslang-build\SPIRV\Release;..\Vulkan\glslang-build\OGLCompilersDLL\Release;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Release;..\Vulkan\Vulkan-build\loader\Release;..\Vulkan\glslang-build\glslang\Release;..\lib\$(CONFIGURATION)-$(PLATFORM);..\3rdparty\minidx12\Lib;$(QTDIR)\lib;C:\utils\my_sql\my_sql\lib;C:\utils\postgresql\pgsql\lib;$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
148148
<AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)</AdditionalOptions>
149149
<DataExecutionPrevention>true</DataExecutionPrevention>
150-
<GenerateDebugInformation>false</GenerateDebugInformation>
150+
<GenerateDebugInformation>Debug</GenerateDebugInformation>
151151
<IgnoreImportLibrary>true</IgnoreImportLibrary>
152152
<LinkIncremental>false</LinkIncremental>
153153
<OutputFile>$(OutDir)\rpcs3-qt.exe</OutputFile>
@@ -182,7 +182,7 @@
182182
<AdditionalOptions>-Zc:strictStrings -Zc:throwingNew -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)</AdditionalOptions>
183183
<AssemblerListingLocation>release\</AssemblerListingLocation>
184184
<BrowseInformation>false</BrowseInformation>
185-
<DebugInformationFormat>None</DebugInformationFormat>
185+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
186186
<DisableSpecificWarnings>4577;4467;%(DisableSpecificWarnings)</DisableSpecificWarnings>
187187
<ExceptionHandling>Sync</ExceptionHandling>
188188
<ObjectFileName>$(IntDir)</ObjectFileName>
@@ -201,7 +201,7 @@
201201
<AdditionalLibraryDirectories>..\3rdparty\OpenAL\libs\Win64;..\Vulkan\glslang-build\hlsl\Release;..\Vulkan\glslang-build\SPIRV\Release;..\Vulkan\glslang-build\OGLCompilersDLL\Release;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Release;..\Vulkan\Vulkan-build\loader\Release;..\Vulkan\glslang-build\glslang\Release;..\lib\$(CONFIGURATION)-$(PLATFORM);..\3rdparty\minidx12\Lib;$(QTDIR)\lib;C:\utils\my_sql\my_sql\lib;C:\utils\postgresql\pgsql\lib;$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
202202
<AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)</AdditionalOptions>
203203
<DataExecutionPrevention>true</DataExecutionPrevention>
204-
<GenerateDebugInformation>false</GenerateDebugInformation>
204+
<GenerateDebugInformation>Debug</GenerateDebugInformation>
205205
<IgnoreImportLibrary>true</IgnoreImportLibrary>
206206
<LinkIncremental>false</LinkIncremental>
207207
<OutputFile>$(OutDir)\rpcs3-qt.exe</OutputFile>
@@ -255,7 +255,7 @@
255255
<AdditionalLibraryDirectories>..\3rdparty\OpenAL\libs\Win64;..\Vulkan\glslang-build\hlsl\Debug;..\Vulkan\glslang-build\SPIRV\Debug;..\Vulkan\glslang-build\OGLCompilersDLL\Debug;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Debug;..\Vulkan\Vulkan-build\loader\Debug;..\Vulkan\glslang-build\glslang\Debug;..\3rdparty\minidx12\Lib;..\lib\$(CONFIGURATION)-$(PLATFORM);$(QTDIR)\lib;C:\utils\my_sql\my_sql\lib;C:\utils\postgresql\pgsql\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
256256
<AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)</AdditionalOptions>
257257
<DataExecutionPrevention>true</DataExecutionPrevention>
258-
<GenerateDebugInformation>true</GenerateDebugInformation>
258+
<GenerateDebugInformation>Debug</GenerateDebugInformation>
259259
<IgnoreImportLibrary>true</IgnoreImportLibrary>
260260
<OutputFile>$(OutDir)\rpcs3-qtd.exe</OutputFile>
261261
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -310,7 +310,7 @@
310310
<AdditionalLibraryDirectories>..\3rdparty\OpenAL\libs\Win64;..\Vulkan\glslang-build\hlsl\Debug;..\Vulkan\glslang-build\SPIRV\Debug;..\Vulkan\glslang-build\OGLCompilersDLL\Debug;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Debug;..\Vulkan\Vulkan-build\loader\Debug;..\Vulkan\glslang-build\glslang\Debug;..\3rdparty\minidx12\Lib;..\lib\$(CONFIGURATION)-$(PLATFORM);$(QTDIR)\lib;C:\utils\my_sql\my_sql\lib;C:\utils\postgresql\pgsql\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
311311
<AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" /VERBOSE %(AdditionalOptions)</AdditionalOptions>
312312
<DataExecutionPrevention>true</DataExecutionPrevention>
313-
<GenerateDebugInformation>true</GenerateDebugInformation>
313+
<GenerateDebugInformation>Debug</GenerateDebugInformation>
314314
<IgnoreImportLibrary>true</IgnoreImportLibrary>
315315
<OutputFile>$(OutDir)\rpcs3-qtd.exe</OutputFile>
316316
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -1524,4 +1524,4 @@
15241524
<UserProperties MocDir=".\QTGeneratedFiles\$(ConfigurationName)" UicDir=".\QTGeneratedFiles" RccDir=".\QTGeneratedFiles" Qt5Version_x0020_x64="$(DefaultQtVersion)" />
15251525
</VisualStudio>
15261526
</ProjectExtensions>
1527-
</Project>
1527+
</Project>

0 commit comments

Comments
 (0)