libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-27 10:20:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move QtMain.cpp and PCMain.cpp to more sensible locations. Native isn't standalone anymore...

Browse Source
This commit is contained in:
Henrik Rydgård 2017-12-19 18:04:26 +01:00
parent 5c1dad9909
commit 740d0504ad
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -696,8 +696,8 @@ elseif(USING_QT_UI)
qt5_wrap_ui(QT_UI_GEN ${Qt_UI})
list(APPEND NativeAppSource
${QT_UI_GEN}
ext/native/base/QtMain.cpp
ext/native/base/QtMain.h
Qt/QtMain.cpp
Qt/QtMain.h
Qt/mainwindow.cpp
Qt/mainwindow.h
Qt/Debugger/ctrldisasmview.cpp
@ -742,7 +742,7 @@ elseif(TARGET SDL2::SDL2)
set(nativeExtra ${nativeExtra}
SDL/SDLJoystick.h
SDL/SDLJoystick.cpp
ext/native/base/PCMain.cpp)
SDL/SDLMain.cpp)
set(nativeExtraLibs ${nativeExtraLibs} SDL2::SDL2)
if(APPLE)
set(nativeExtra ${nativeExtra} SDL/SDLMain.h SDL/SDLMain.mm)

0
ext/native/base/QtMain.cpp → Qt/QtMain.cpp
View File

0
ext/native/base/QtMain.h → Qt/QtMain.h
View File

2
Qt/mainwindow.h
View File

@ -14,7 +14,7 @@
#include "Debugger/debugger_memory.h"
#include "Debugger/debugger_memorytex.h"
#include "Debugger/debugger_displaylist.h"
#include "base/QtMain.h"
#include "Qt/QtMain.h"
extern bool g_TakeScreenshot;

0
ext/native/base/PCMain.cpp → SDL/SDLMain.cpp
View File

2
ext/native/base/NativeApp.h
View File

@ -111,7 +111,7 @@ void NativeSaveState(); // onDestroy
void NativePermissionStatus(SystemPermission permission, PermissionStatus status);
// Calls back into Java / SDL
// These APIs must be implemented by every port (for example app-android.cpp, PCMain.cpp).
// These APIs must be implemented by every port (for example app-android.cpp, SDLMain.cpp).
// You are free to call these.
void SystemToast(const char *text);
void ShowKeyboard();

6
ext/native/native.vcxproj
View File

@ -299,13 +299,13 @@
<ClCompile Include="base\colorutil.cpp" />
<ClCompile Include="base\display.cpp" />
<ClCompile Include="base\logging.cpp" />
<ClCompile Include="base\PCMain.cpp">
<ClCompile Include="..\..\SDL\SDLMain.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="base\QtMain.cpp">
<ClCompile Include="..\..\Qt\QtMain.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@ -761,4 +761,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

6
ext/native/native.vcxproj.filters
View File

@ -739,10 +739,10 @@
<ClCompile Include="thread\executor.cpp">
<Filter>thread</Filter>
</ClCompile>
<ClCompile Include="base\PCMain.cpp">
<ClCompile Include="..\..\SDL\SDLMain.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="base\QtMain.cpp">
<ClCompile Include="..\..\Qt\QtMain.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="file\free.cpp">
@ -868,4 +868,4 @@
<UniqueIdentifier>{06c6305a-a646-485b-85b9-645a24dd6553}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>
</Project>