因为遍历文件夹的函数修复, 所以切换回hikogui主分支

This commit is contained in:
Nanako 2024-03-23 22:20:34 +08:00
parent 359473930c
commit e106a039d8
9 changed files with 20 additions and 11 deletions

2
.gitmodules vendored
View File

@ -3,4 +3,4 @@
url = http://www.nanako.site:9004/Nanako/AronaCore.git url = http://www.nanako.site:9004/Nanako/AronaCore.git
[submodule "Arona/third_party/hikogui"] [submodule "Arona/third_party/hikogui"]
path = Arona/third_party/hikogui path = Arona/third_party/hikogui
url = http://www.nanako.site:9004/Nanako/hikogui.git url = https://github.com/hikogui/hikogui.git

View File

@ -1,18 +1,15 @@
project(arona) project(arona)
set(CMAKE_CXX_STANDARD 26) set(CMAKE_CXX_STANDARD 26)
set(ALL_FILES "")
retrieve_files(${CMAKE_CURRENT_SOURCE_DIR} ALL_FILES)
add_subdirectory(third_party/hikogui)
if (WIN32) if (WIN32)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:WinMainCRTStartup") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:WinMainCRTStartup")
endif() endif()
add_executable(${PROJECT_NAME} ${ALL_FILES}) add_subdirectory(third_party/hikogui)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) set(ALL_FILES "")
retrieve_files(${CMAKE_CURRENT_SOURCE_DIR}/src ALL_FILES)
add_executable(${PROJECT_NAME} ${ALL_FILES})
target_link_libraries(${PROJECT_NAME} core hikogui) target_link_libraries(${PROJECT_NAME} core hikogui)
target_include_directories(${PROJECT_NAME} PUBLIC core hikogui) target_include_directories(${PROJECT_NAME} PUBLIC core hikogui)

View File

@ -1,9 +1,9 @@
#include "application/application.h" #include "application/application.h"
#include "audio/plugin_host/plugin_host_manager.h" #include "audio/plugin_host/plugin_host_manager.h"
#include "misc/singleton/singleton_manager.h"
#include "hikogui/crt.hpp" #include "hikogui/crt.hpp"
#include "hikogui/hikogui.hpp" #include "hikogui/hikogui.hpp"
using namespace hi; using namespace hi;
class arona_application : public application { class arona_application : public application {

View File

@ -0,0 +1 @@
#include "w_mixer_list.h"

View File

@ -0,0 +1,5 @@
#pragma once
class w_mixer_list {
};

View File

@ -0,0 +1 @@
#include "w_mixer_track.h"

View File

@ -0,0 +1,5 @@
#pragma once
class w_mixer_track {
};

@ -1 +1 @@
Subproject commit 34de06e44f1aaa263e0ff61ccd876243ab3aae7c Subproject commit 136eaafba55888cff3bbf532deb32162f178c7f3

@ -1 +1 @@
Subproject commit 83c7a1fc7d12f75feb3228f27a759bed56560680 Subproject commit 0d73da1657c53763a92826b5bc8ae3a4291a4531