Small fixes from windows
This commit is contained in:
parent
34a8d4eafd
commit
69cdf43909
4 changed files with 24 additions and 12 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -5,3 +5,5 @@ build*
|
|||
lib
|
||||
install
|
||||
.vscode
|
||||
out
|
||||
.vs
|
||||
13
Externals/CMakeLists.txt
vendored
13
Externals/CMakeLists.txt
vendored
|
|
@ -5,8 +5,17 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
|
|||
find_package(GLEW REQUIRED)
|
||||
set(GLEW_LIB ${GLEW_STATIC_LIBRARY_RELEASE} opengl32.lib PARENT_SCOPE)
|
||||
|
||||
set(PORTAUDIO_INCLUDE_DIR "../../ModulesWindowsLibraries/portaudio/include" PARENT_SCOPE)
|
||||
set(PORTAUDIO_LIB "../../ModulesWindowsLibraries/portaudio_build/Debug/portaudio" PARENT_SCOPE)
|
||||
# Your relative paths
|
||||
set(RELATIVE_INCLUDE_DIR "../../ModulesWindowsLibraries/portaudio/include")
|
||||
set(RELATIVE_LIB "../../ModulesWindowsLibraries/portaudio_build/Debug/portaudio.lib")
|
||||
|
||||
# Convert to absolute paths
|
||||
get_filename_component(ABSOLUTE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${RELATIVE_INCLUDE_DIR}" ABSOLUTE)
|
||||
get_filename_component(ABSOLUTE_LIB "${CMAKE_CURRENT_SOURCE_DIR}/${RELATIVE_LIB}" ABSOLUTE)
|
||||
|
||||
# Set absolute paths with respect to the parent scope
|
||||
set(PORTAUDIO_INCLUDE_DIR "${ABSOLUTE_INCLUDE_DIR}" PARENT_SCOPE)
|
||||
set(PORTAUDIO_LIB "${ABSOLUTE_LIB}" PARENT_SCOPE)
|
||||
else()
|
||||
find_package(GLEW REQUIRED)
|
||||
set(GLEW_LIB ${GLEW_LIBRARIES} GL PARENT_SCOPE)
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
|
||||
#include "Player.hpp"
|
||||
#include "GUI.hpp"
|
||||
#include "Player.hpp"
|
||||
|
||||
// 1) artworks
|
||||
// 2) how to easy add more songs?
|
||||
// 3) GUi :
|
||||
// - seeker
|
||||
// - song idx
|
||||
// - seeker
|
||||
// - song idx
|
||||
// - non existing highlight
|
||||
// - prev next
|
||||
// - remove debug gui
|
||||
|
|
@ -14,19 +14,20 @@
|
|||
// 5) new database with history
|
||||
|
||||
void runApp() {
|
||||
|
||||
Player player;
|
||||
Library library; library.loadJson(getHome() + "Library.json"); library.checkExisting();
|
||||
Library library;
|
||||
library.loadJson(getHome() + "Library.json");
|
||||
library.checkExisting();
|
||||
LibraryWidget<tp::Window::Events, tp::Graphics::Canvas> gui(&library, &player);
|
||||
|
||||
auto window = tp::Window::createWindow(800, 600, "Window 1");
|
||||
auto window = tp::Window::createWindow(800, 600, "Window 1");
|
||||
|
||||
if (window) {
|
||||
while (!window->shouldClose()) {
|
||||
window->processEvents();
|
||||
|
||||
|
||||
auto area = window->getCanvas().getAvaliableArea();
|
||||
|
||||
|
||||
gui.proc(window->getEvents(), {}, { area.x, area.y, area.z, area.w });
|
||||
gui.draw(window->getCanvas(), {}, { area.x, area.y, area.z, area.w });
|
||||
|
||||
|
|
@ -48,7 +49,7 @@ int main() {
|
|||
return 1;
|
||||
}
|
||||
|
||||
runApp();
|
||||
|
||||
runApp();
|
||||
|
||||
binModule.deinitialize();
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue