nishi/milsko
1
Fork 0
mirror of https://gitea.nishi.boats/pyrite-dev/milsko synced 2025-12-31 06:30:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix things

Browse Source 
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@501 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
NishiOwO
2025-10-29 08:50:39 +00:00
parent 6a9b2bc614
commit 02a6b8b11a
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@@ -6,6 +6,8 @@ project(
DESCRIPTION "Milsko GUI Toolkit" DESCRIPTION "Milsko GUI Toolkit"
) )
include(CheckIncludeFiles)
option(OPENGL "Compile OpenGL widget or not" ON) option(OPENGL "Compile OpenGL widget or not" ON)
if(CMAKE_SYSTEM_NAME STREQUAL "SunOS") if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
option(VULKAN "Compile Vulkan widget or not" OFF) option(VULKAN "Compile Vulkan widget or not" OFF)
@@ -140,8 +142,11 @@ else()
if(CMAKE_SYSTEM_NAME STREQUAL "Linux") if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
list(APPEND LIBRARIES dl) list(APPEND LIBRARIES dl)
endif() endif()
if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD" AND VULKAN) if(VULKAN)
list(APPEND INCLUDE_DIRS /usr/pkg/include) pkg_check_modules(VULKAN REQUIRED vulkan)
list(APPEND INCLUDE_DIRS ${VULKAN_INCLUDE_DIRS})
list(APPEND LIBRARY_DIRS ${VULKAN_LIBRARY_DIRS})
list(APPEND LIBRARIES ${VULKAN_LIBRARIES})
endif() endif()
endif() endif()
@@ -161,6 +166,17 @@ target_link_libraries(
${LIBRARIES} ${LIBRARIES}
) )
if(VULKAN)
check_include_files(vulkan/vk_enum_string_helper.h HAS_VK_ENUM_STRING_HELPER)
if(HAS_VK_ENUM_STRING_HELPER)
target_compile_definitions(
Mw
PRIVATE
HAS_VK_ENUM_STRING_HELPER
)
endif()
endif()
target_compile_definitions( target_compile_definitions(
Mw Mw
PRIVATE PRIVATE

8
src/core.c
View File

@@ -55,7 +55,7 @@ static void llclosehandler(MwLL handle, void* data) {
(void)data; (void)data;
if((n = MwGetInteger(h, MwNmain)) != -1 && n) { if((n = MwGetInteger(h, MwNmain)) != MwDEFAULT && n) {
while(h != NULL) { while(h != NULL) {
h->close = 1; h->close = 1;
MwDispatchUserHandler(h, MwNcloseHandler, NULL); MwDispatchUserHandler(h, MwNcloseHandler, NULL);
@@ -152,7 +152,7 @@ MwWidget MwCreateWidget(MwClass widget_class, const char* name, MwWidget parent,
sh_new_strdup(h->handler); sh_new_strdup(h->handler);
sh_new_strdup(h->data); sh_new_strdup(h->data);
shdefault(h->integer, -1); shdefault(h->integer, MwDEFAULT);
shdefault(h->text, NULL); shdefault(h->text, NULL);
shdefault(h->handler, NULL); shdefault(h->handler, NULL);
shdefault(h->data, NULL); shdefault(h->data, NULL);
@@ -369,7 +369,7 @@ int MwGetInteger(MwWidget handle, const char* key) {
if(strcmp(key, MwNy) == 0) return y; if(strcmp(key, MwNy) == 0) return y;
if(strcmp(key, MwNwidth) == 0) return w; if(strcmp(key, MwNwidth) == 0) return w;
if(strcmp(key, MwNheight) == 0) return h; if(strcmp(key, MwNheight) == 0) return h;
return -1; return MwDEFAULT;
} else { } else {
return shget(handle->integer, key); return shget(handle->integer, key);
} }
@@ -438,7 +438,7 @@ static void inherit_integer(MwWidget handle, const char* key, int default_value)
int n; int n;
MwWidget h = handle; MwWidget h = handle;
while(h != NULL) { while(h != NULL) {
if((n = MwGetInteger(h, key)) != -1) { if((n = MwGetInteger(h, key)) != MwDEFAULT) {
MwSetInteger(handle, key, n); MwSetInteger(handle, key, n);
return; return;
} }