piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-21 05:09:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix dumb include path shit.

Browse Source
This commit is contained in:
Arisotura
2020-04-27 15:59:52 +02:00
parent 690f9f3874
commit d9c55a4f1f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/qt_sdl/CMakeLists.txt
View File

@ -21,6 +21,7 @@ pkg_check_modules(SDL2 REQUIRED sdl2)
add_executable(melonDS ${SOURCES_QT_SDL}) add_executable(melonDS ${SOURCES_QT_SDL})
target_include_directories(melonDS PRIVATE ${SDL2_INCLUDE_DIRS}) target_include_directories(melonDS PRIVATE ${SDL2_INCLUDE_DIRS})
target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../..")
target_link_libraries(melonDS core ${SDL2_LIBRARIES}) target_link_libraries(melonDS core ${SDL2_LIBRARIES})
if (UNIX) if (UNIX)
@ -52,7 +53,6 @@ if (UNIX)
target_sources(melonDS PUBLIC melon_grc.c) target_sources(melonDS PUBLIC melon_grc.c)
elseif (WIN32) elseif (WIN32)
target_sources(melonDS PUBLIC "${CMAKE_SOURCE_DIR}/melon.rc") target_sources(melonDS PUBLIC "${CMAKE_SOURCE_DIR}/melon.rc")
target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../..")
target_link_libraries(melonDS comctl32 d2d1 dwrite uxtheme ws2_32 iphlpapi gdi32 Qt5::Core Qt5::Gui Qt5::Widgets) target_link_libraries(melonDS comctl32 d2d1 dwrite uxtheme ws2_32 iphlpapi gdi32 Qt5::Core Qt5::Gui Qt5::Widgets)
endif () endif ()

7
src/frontend/qt_sdl/main.cpp
View File

@ -208,6 +208,7 @@ printf("emu thread start: %d\n", EmuRunning);
uiGLEnd(GLContext); uiGLEnd(GLContext);
} }
uiAreaQueueRedrawAll(MainDrawArea);*/ uiAreaQueueRedrawAll(MainDrawArea);*/
mainWindow->update();
/*bool fastforward = HotkeyDown(HK_FastForward); /*bool fastforward = HotkeyDown(HK_FastForward);
@ -292,6 +293,7 @@ printf("emu thread start: %d\n", EmuRunning);
uiGLEnd(GLContext); uiGLEnd(GLContext);
} }
uiAreaQueueRedrawAll(MainDrawArea);*/ uiAreaQueueRedrawAll(MainDrawArea);*/
mainWindow->update();
} }
//if (Screen_UseGL) uiGLMakeContextCurrent(NULL); //if (Screen_UseGL) uiGLMakeContextCurrent(NULL);
@ -359,7 +361,10 @@ void MainWindowPanel::paintEvent(QPaintEvent* event)
{ {
QPainter painter(this); QPainter painter(this);
//painter. // fill background
painter.fillRect(event->rect(), QColor::fromRgb(0, 0, 0));
painter.fillRect(0, 0, 256, 192, QColor::fromRgb(0, 255, 255));
} }