因为遍历文件夹的函数修复, 所以切换回hikogui主分支
This commit is contained in:
parent
359473930c
commit
e106a039d8
2
.gitmodules
vendored
2
.gitmodules
vendored
@ -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
|
||||||
|
@ -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)
|
||||||
|
@ -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 {
|
||||||
|
1
Arona/src/widget/mixer/w_mixer_list.cpp
Normal file
1
Arona/src/widget/mixer/w_mixer_list.cpp
Normal file
@ -0,0 +1 @@
|
|||||||
|
#include "w_mixer_list.h"
|
5
Arona/src/widget/mixer/w_mixer_list.h
Normal file
5
Arona/src/widget/mixer/w_mixer_list.h
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
class w_mixer_list {
|
||||||
|
|
||||||
|
};
|
1
Arona/src/widget/mixer/w_mixer_track.cpp
Normal file
1
Arona/src/widget/mixer/w_mixer_track.cpp
Normal file
@ -0,0 +1 @@
|
|||||||
|
#include "w_mixer_track.h"
|
5
Arona/src/widget/mixer/w_mixer_track.h
Normal file
5
Arona/src/widget/mixer/w_mixer_track.h
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
class w_mixer_track {
|
||||||
|
|
||||||
|
};
|
2
Arona/third_party/hikogui
vendored
2
Arona/third_party/hikogui
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 34de06e44f1aaa263e0ff61ccd876243ab3aae7c
|
Subproject commit 136eaafba55888cff3bbf532deb32162f178c7f3
|
@ -1 +1 @@
|
|||||||
Subproject commit 83c7a1fc7d12f75feb3228f27a759bed56560680
|
Subproject commit 0d73da1657c53763a92826b5bc8ae3a4291a4531
|
Loading…
x
Reference in New Issue
Block a user