mirror of
https://github.com/seekrs/MacroLibX.git
synced 2026-01-11 22:53:34 +00:00
bumping version, small fixes
This commit is contained in:
2
LICENSE
2
LICENSE
@@ -1,5 +1,5 @@
|
|||||||
MIT License
|
MIT License
|
||||||
Copyright (c) 2022-2024 kbz_8
|
Copyright (c) 2022-2026 kbz_8
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
|||||||
5
Makefile
5
Makefile
@@ -4,7 +4,6 @@ MAKE = make --no-print-directory
|
|||||||
OS ?= $(shell uname -s)
|
OS ?= $(shell uname -s)
|
||||||
DEBUG ?= false
|
DEBUG ?= false
|
||||||
TOOLCHAIN ?= clang
|
TOOLCHAIN ?= clang
|
||||||
FORCE_INTEGRATED_GPU ?= false
|
|
||||||
GRAPHICS_MEMORY_DUMP ?= false
|
GRAPHICS_MEMORY_DUMP ?= false
|
||||||
PROFILER ?= false
|
PROFILER ?= false
|
||||||
FORCE_WAYLAND ?= false
|
FORCE_WAYLAND ?= false
|
||||||
@@ -64,10 +63,6 @@ else
|
|||||||
CXXFLAGS += -O3
|
CXXFLAGS += -O3
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(FORCE_INTEGRATED_GPU), true)
|
|
||||||
_ENABLEDFLAGS += FORCE_INTEGRATED_GPU
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(GRAPHICS_MEMORY_DUMP), true)
|
ifeq ($(GRAPHICS_MEMORY_DUMP), true)
|
||||||
_ENABLEDFLAGS += GRAPHICS_MEMORY_DUMP
|
_ENABLEDFLAGS += GRAPHICS_MEMORY_DUMP
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -103,9 +103,6 @@ MacroLibX has a strong safety support, mainly by checking every pointer that you
|
|||||||
### 🛠️ Set the toolchain
|
### 🛠️ Set the toolchain
|
||||||
If you want to use `GCC` to build the mlx you can use `make TOOLCHAIN=gcc`
|
If you want to use `GCC` to build the mlx you can use `make TOOLCHAIN=gcc`
|
||||||
|
|
||||||
### 🖥️ Force the integrated GPU (not recommended)
|
|
||||||
You can force the mlx to use your integrated GPU by using `make FORCE_INTEGRATED_GPU=true`. Note that there are a lot of chances that your application crashes by using that.
|
|
||||||
|
|
||||||
### 💽 Dump the graphics memory
|
### 💽 Dump the graphics memory
|
||||||
The mlx can dump it's graphics memory use to json files every two seconds by enabling this option `make GRAPHICS_MEMORY_DUMP=true`.
|
The mlx can dump it's graphics memory use to json files every two seconds by enabling this option `make GRAPHICS_MEMORY_DUMP=true`.
|
||||||
|
|
||||||
|
|||||||
@@ -16,9 +16,6 @@ MacroLibX has a strong safety support, mainly by checking every pointer that you
|
|||||||
### 🛠️ Set the toolchain
|
### 🛠️ Set the toolchain
|
||||||
To change the compilation toolchain you can use `xmake config --toolchain=[gcc|clang|...]`
|
To change the compilation toolchain you can use `xmake config --toolchain=[gcc|clang|...]`
|
||||||
|
|
||||||
### 🖥️ Force the integrated GPU (not recommended)
|
|
||||||
You can force the mlx to use your integrated GPU using `xmake config --force_integrated_gpu=y`. Note that there are a lot of chances that your application crashes by using that.
|
|
||||||
|
|
||||||
### 💽 Dump the graphics memory
|
### 💽 Dump the graphics memory
|
||||||
The mlx can dump it's graphics memory use to json files every two seconds by enabling this option `xmake config --graphics_memory_dump=y`.
|
The mlx can dump it's graphics memory use to json files every two seconds by enabling this option `xmake config --graphics_memory_dump=y`.
|
||||||
|
|
||||||
|
|||||||
@@ -206,7 +206,7 @@
|
|||||||
|
|
||||||
typedef void (*mlx_function)(void);
|
typedef void (*mlx_function)(void);
|
||||||
|
|
||||||
#define MLX_VERSION MLX_MAKE_VERSION(2, 2, 0)
|
#define MLX_VERSION MLX_MAKE_VERSION(2, 2, 3)
|
||||||
#define MLX_TARGET_VULKAN_API_VERSION MLX_MAKE_VERSION(1, 0, 0)
|
#define MLX_TARGET_VULKAN_API_VERSION MLX_MAKE_VERSION(1, 0, 0)
|
||||||
|
|
||||||
// Checking common assumptions
|
// Checking common assumptions
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
project('MacroLibX',
|
project('MacroLibX',
|
||||||
['c', 'cpp'],
|
['c', 'cpp'],
|
||||||
version : '2.2.2',
|
version : '2.2.3',
|
||||||
license : 'MIT',
|
license : 'MIT',
|
||||||
meson_version : '>= 1.9.0',
|
meson_version : '>= 1.9.0',
|
||||||
default_options : ['warning_level=2', 'optimization=3', 'cpp_std=c++20'])
|
default_options : ['warning_level=2', 'optimization=3', 'cpp_std=c++20'])
|
||||||
@@ -9,10 +9,6 @@ add_project_arguments('-Wno-error=', language : 'c')
|
|||||||
add_project_arguments('-fPIC', language : 'c')
|
add_project_arguments('-fPIC', language : 'c')
|
||||||
add_project_arguments('-DSDL_MAIN_HANDLED', language : 'c')
|
add_project_arguments('-DSDL_MAIN_HANDLED', language : 'c')
|
||||||
|
|
||||||
if get_option('force_integrated_gpu')
|
|
||||||
add_project_arguments('-DFORCE_INTEGRATED_GPU', language : 'c')
|
|
||||||
endif
|
|
||||||
|
|
||||||
if get_option('graphics_memory_dump')
|
if get_option('graphics_memory_dump')
|
||||||
add_project_arguments('-DGRAPHICS_MEMORY_DUMP', language : 'c')
|
add_project_arguments('-DGRAPHICS_MEMORY_DUMP', language : 'c')
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -1,9 +1,3 @@
|
|||||||
option('force_integrated_gpu',
|
|
||||||
type : 'boolean',
|
|
||||||
value : false,
|
|
||||||
description : 'Force the application to use the integrated GPU if available.'
|
|
||||||
)
|
|
||||||
|
|
||||||
option('graphics_memory_dump',
|
option('graphics_memory_dump',
|
||||||
type : 'boolean',
|
type : 'boolean',
|
||||||
value : false,
|
value : false,
|
||||||
@@ -26,4 +20,4 @@ option('disable_all_safeties',
|
|||||||
type : 'boolean',
|
type : 'boolean',
|
||||||
value : false,
|
value : false,
|
||||||
description : 'Disable all safety checks in the application.'
|
description : 'Disable all safety checks in the application.'
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -21,6 +21,6 @@ rm vulkan-headers.zip
|
|||||||
|
|
||||||
# Update KVF
|
# Update KVF
|
||||||
rm -f ../third_party/kvf.h
|
rm -f ../third_party/kvf.h
|
||||||
git clone https://github.com/Kbz-8/KVF.git ../third_party/KVF/
|
git clone https://git.kbz8.me/kbz_8/KVF.git ../third_party/KVF/
|
||||||
mv ../third_party/KVF/kvf.h ../third_party/kvf.h
|
mv ../third_party/KVF/kvf.h ../third_party/kvf.h
|
||||||
rm -rf ../third_party/KVF
|
rm -rf ../third_party/KVF
|
||||||
|
|||||||
@@ -11,11 +11,6 @@ set_targetdir("./")
|
|||||||
set_optimize("fastest")
|
set_optimize("fastest")
|
||||||
|
|
||||||
-- Options
|
-- Options
|
||||||
option("force_integrated_gpu")
|
|
||||||
set_default(false)
|
|
||||||
add_defines("FORCE_INTEGRATED_GPU")
|
|
||||||
option_end()
|
|
||||||
|
|
||||||
option("graphics_memory_dump")
|
option("graphics_memory_dump")
|
||||||
set_default(false)
|
set_default(false)
|
||||||
add_defines("GRAPHICS_MEMORY_DUMP")
|
add_defines("GRAPHICS_MEMORY_DUMP")
|
||||||
@@ -42,7 +37,6 @@ target("mlx")
|
|||||||
set_default(true)
|
set_default(true)
|
||||||
set_license("MIT")
|
set_license("MIT")
|
||||||
set_kind("shared")
|
set_kind("shared")
|
||||||
add_options("force_integrated_gpu")
|
|
||||||
add_options("graphics_memory_dump")
|
add_options("graphics_memory_dump")
|
||||||
add_options("profiler")
|
add_options("profiler")
|
||||||
add_options("force_wayland")
|
add_options("force_wayland")
|
||||||
|
|||||||
Reference in New Issue
Block a user