aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArisotura <thetotalworm@gmail.com>2020-04-27 15:59:52 +0200
committerArisotura <thetotalworm@gmail.com>2020-04-27 15:59:52 +0200
commitd9c55a4f1f269de2fd17fe214403f13a9cf6f341 (patch)
tree13e62552a07c3c1844d72c62b74a7c9a8ea83a20
parent690f9f38744ddda7fd65c299288227767e4b03f0 (diff)
fix dumb include path shit.
-rw-r--r--src/frontend/qt_sdl/CMakeLists.txt2
-rw-r--r--src/frontend/qt_sdl/main.cpp7
2 files changed, 7 insertions, 2 deletions
diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt
index f24464d..baa4be2 100644
--- a/src/frontend/qt_sdl/CMakeLists.txt
+++ b/src/frontend/qt_sdl/CMakeLists.txt
@@ -21,6 +21,7 @@ pkg_check_modules(SDL2 REQUIRED sdl2)
add_executable(melonDS ${SOURCES_QT_SDL})
target_include_directories(melonDS PRIVATE ${SDL2_INCLUDE_DIRS})
+target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../..")
target_link_libraries(melonDS core ${SDL2_LIBRARIES})
if (UNIX)
@@ -52,7 +53,6 @@ if (UNIX)
target_sources(melonDS PUBLIC melon_grc.c)
elseif (WIN32)
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)
endif ()
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index 9192685..4999d94 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -208,6 +208,7 @@ printf("emu thread start: %d\n", EmuRunning);
uiGLEnd(GLContext);
}
uiAreaQueueRedrawAll(MainDrawArea);*/
+ mainWindow->update();
/*bool fastforward = HotkeyDown(HK_FastForward);
@@ -292,6 +293,7 @@ printf("emu thread start: %d\n", EmuRunning);
uiGLEnd(GLContext);
}
uiAreaQueueRedrawAll(MainDrawArea);*/
+ mainWindow->update();
}
//if (Screen_UseGL) uiGLMakeContextCurrent(NULL);
@@ -359,7 +361,10 @@ void MainWindowPanel::paintEvent(QPaintEvent* event)
{
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));
}