Skip to content

Commit

Permalink
Update Netzhaut. Fix includes.
Browse files Browse the repository at this point in the history 
Increments-patch-version-of: ttyr-terminal
Increments-patch-version-of: ttyr-tty
Increments-patch-version-of: misc
  • Loading branch information
@dajofrey
dajofrey committed Nov 4, 2024
1 parent ea35ba6 commit 7fb2f60
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 15 deletions.
11 changes: 5 additions & 6 deletions build/automation/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,21 +90,20 @@ LIB_TTYR_API = lib/libttyr-api.so
LIB_ST = external/st-0.8.5/libst.so
BIN_TTYR = bin/ttyr

# Build targets for each library
all: build_netzhaut $(LIB_ST) $(LIB_TTYR_TTY) $(LIB_TTYR_TERMINAL) $(LIB_TTYR_API) $(BIN_TTYR)
lib: build_netzhaut $(LIB_ST) $(LIB_TTYR_TTY) $(LIB_TTYR_TERMINAL) $(LIB_TTYR_API)
bin: build_netzhaut $(BIN_TTYR)

build_netzhaut:
ifeq ($(NETZHAUT_PATH),$(CURDIR)/external/Netzhaut)
(cd external/Netzhaut && git submodule update --init --recursive && make -f build/automation/lib.mk nh-api.so nh-core.so nh-encoding.so nh-wsi.so nh-gfx.so)
endif

create_lib_dir:
mkdir -p lib
create_bin_dir:
mkdir -p bin

# Build targets for each library
all: build_netzhaut $(LIB_ST) $(LIB_TTYR_TTY) $(LIB_TTYR_TERMINAL) $(LIB_TTYR_API) $(BIN_TTYR)
lib: build_netzhaut $(LIB_ST) $(LIB_TTYR_TTY) $(LIB_TTYR_TERMINAL) $(LIB_TTYR_API)
bin: build_netzhaut $(BIN_TTYR)

# Custom compiler flags
$(OBJ_FILES_TTYR_TERMINAL): CFLAGS += -I$(NETZHAUT_PATH)/external -I$(NETZHAUT_PATH)/src/lib -I$(NETZHAUT_PATH)/external/Vulkan-Headers/include -DINCLUDE_VOLK -DVK_VERSION_1_2 -DVK_USE_PLATFORM_XLIB_KHR -DVK_KHR_xlib_surface
$(OBJ_FILES_TTYR_TTY): CFLAGS += -I$(NETZHAUT_PATH)/external -I$(NETZHAUT_PATH)/src/lib
Expand Down
2 changes: 1 addition & 1 deletion external/Netzhaut
Submodule Netzhaut updated 90 files
+2 −1 .gitignore
+18 −11 README.md
+34 −24 build/automation/bin.mk
+8 −10 build/automation/lib.mk
+7 −1 build/data/misc/default.conf
+1 −1 external/TTyr
+0 −61 src/bin/nh-core/About.h
+0 −19 src/bin/nh-core/Main.c
+50 −0 src/bin/nh-css/Main.c
+1 −102 src/bin/nh-html/Main.c
+115 −0 src/bin/nh-monitor/Main.c
+1 −0 src/lib/nh-api/nh-api.h
+11 −19 src/lib/nh-api/nh-core.c
+5 −11 src/lib/nh-api/nh-core.h
+13 −0 src/lib/nh-api/nh-css.c
+8 −0 src/lib/nh-api/nh-css.h
+39 −0 src/lib/nh-api/nh-monitor.c
+27 −0 src/lib/nh-api/nh-monitor.h
+57 −7 src/lib/nh-core/Common/Config.c
+21 −34 src/lib/nh-core/Common/Config.h
+38 −24 src/lib/nh-core/Common/Data/default.conf.inc
+1 −1 src/lib/nh-core/Common/Initialize.c
+6 −24 src/lib/nh-core/Common/Log.c
+18 −30 src/lib/nh-core/Common/Log.h
+1 −1 src/lib/nh-core/Common/Terminate.c
+1 −0 src/lib/nh-core/Loader/Loader.c
+29 −102 src/lib/nh-core/Logger/Logger.c
+4 −16 src/lib/nh-core/Logger/Logger.h
+166 −55 src/lib/nh-core/Logger/Monitor.c
+1 −3 src/lib/nh-core/Logger/Monitor.h
+66 −0 src/lib/nh-core/Logger/Socket.c
+0 −0 src/lib/nh-core/Logger/Socket.h
+9 −2 src/lib/nh-core/Util/Debug.c
+3 −0 src/lib/nh-core/Util/HashMap.c
+1 −3 src/lib/nh-css/Common/Initialize.c
+73 −66 src/lib/nh-css/Common/Log.c
+30 −52 src/lib/nh-css/Common/Log.h
+2 −2 src/lib/nh-css/Interfaces/RuleList.c
+1 −1 src/lib/nh-css/Interfaces/RuleList.h
+4 −5 src/lib/nh-css/Interfaces/StyleDeclaration.c
+2 −2 src/lib/nh-css/Interfaces/StyleDeclaration.h
+13 −13 src/lib/nh-css/Interfaces/StyleRule.c
+5 −5 src/lib/nh-css/Interfaces/StyleRule.h
+3 −3 src/lib/nh-css/Interfaces/StyleSheet.c
+2 −2 src/lib/nh-css/Interfaces/StyleSheet.h
+15 −0 src/lib/nh-css/Layout/Block.c
+8 −9 src/lib/nh-css/Layout/BoxModel.c
+12 −7 src/lib/nh-css/Layout/LayoutValues.c
+2 −2 src/lib/nh-css/Layout/LayoutValues.h
+4 −4 src/lib/nh-css/Parser/ComponentParser.c
+0 −28 src/lib/nh-css/Parser/Match.h
+17 −9 src/lib/nh-css/Parser/Parser.c
+21 −39 src/lib/nh-css/Parser/Parser.h
+10 −6 src/lib/nh-css/Parser/SelectorParser.c
+10 −15 src/lib/nh-css/Parser/TokenParser.c
+1 −1 src/lib/nh-css/Parser/TokenParser.h
+106 −38 src/lib/nh-css/Properties/Cascade.c
+2 −2 src/lib/nh-css/Properties/Cascade.h
+1 −2 src/lib/nh-css/Properties/Compute.c
+49 −43 src/lib/nh-css/Properties/Filter.c
+30 −58 src/lib/nh-css/Properties/Filter.h
+49 −21 src/lib/nh-css/Properties/Match.c
+17 −0 src/lib/nh-css/Properties/Match.h
+11 −7 src/lib/nh-css/Properties/Values.c
+1 −1 src/lib/nh-css/Properties/Values.h
+2 −25 src/lib/nh-dom/Common/Log.c
+3 −25 src/lib/nh-dom/Common/Log.h
+5 −7 src/lib/nh-dom/Interfaces/Element.c
+2 −2 src/lib/nh-dom/Interfaces/Element.h
+1 −26 src/lib/nh-ecmascript/Common/Log.c
+2 −26 src/lib/nh-encoding/Common/Log.c
+5 −27 src/lib/nh-encoding/Common/Log.h
+1 −24 src/lib/nh-gfx/Common/Log.c
+0 −12 src/lib/nh-gfx/Common/Log.h
+2 −30 src/lib/nh-html/Common/Log.c
+6 −28 src/lib/nh-html/Common/Log.h
+2 −3 src/lib/nh-network/Common/Log.c
+2 −3 src/lib/nh-renderer/Common/Initialize.c
+5 −14 src/lib/nh-renderer/Common/Initialize.h
+2 −25 src/lib/nh-renderer/Common/Log.c
+2 −24 src/lib/nh-renderer/Common/Log.h
+3 −30 src/lib/nh-url/Common/Log.c
+6 −28 src/lib/nh-url/Common/Log.h
+3 −3 src/lib/nh-url/Common/Macros.h
+1 −1 src/lib/nh-webidl/Common/IndexMap.c
+2 −25 src/lib/nh-webidl/Common/Log.c
+12 −34 src/lib/nh-webidl/Common/Log.h
+18 −28 src/lib/nh-webidl/Runtime/Object.h
+2 −2 src/lib/nh-wsi/Common/Log.c
+6 −16 src/lib/nh-wsi/Common/Log.h
2 changes: 1 addition & 1 deletion src/lib/ttyr-terminal/Common/Initialize.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "nh-gfx/Vulkan/Vulkan.h"

#include "nh-core/Config/Config.h"
#include "nh-core/System/Logger.h"
#include "nh-core/Logger/Logger.h"
#include "nh-core/System/Memory.h"

#include <stdlib.h>
Expand Down
2 changes: 1 addition & 1 deletion src/lib/ttyr-terminal/Common/Log.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "Log.h"
#include "Macros.h"

#include "nh-core/System/Logger.h"
#include "nh-core/Logger/Logger.h"

#include <stdio.h>
#include <stdlib.h>
Expand Down
2 changes: 1 addition & 1 deletion src/lib/ttyr-terminal/Terminal/Grid.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "nh-core/System/Thread.h"
#include "nh-core/System/Memory.h"
#include "nh-core/System/Process.h"
#include "nh-core/System/Logger.h"
#include "nh-core/Logger/Logger.h"

#include "nh-encoding/Encodings/UTF8.h"
#include "nh-encoding/Encodings/UTF32.h"
Expand Down
1 change: 0 additions & 1 deletion src/lib/ttyr-tty/Common/Config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,4 +143,3 @@ ttyr_tty_Config ttyr_tty_getConfig()
}
return Config;
}

2 changes: 1 addition & 1 deletion src/lib/ttyr-tty/Common/Initialize.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "Data/ttyr-tty.conf.inc"

#include "nh-core/Config/Config.h"
#include "nh-core/System/Logger.h"
#include "nh-core/Logger/Logger.h"
#include "nh-core/System/Memory.h"

#include <stdlib.h>
Expand Down
2 changes: 1 addition & 1 deletion src/lib/ttyr-tty/Common/Log.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "Log.h"
#include "Macros.h"

#include "nh-core/System/Logger.h"
#include "nh-core/Logger/Logger.h"

#include <stdio.h>
#include <stdlib.h>
Expand Down
2 changes: 1 addition & 1 deletion src/lib/ttyr-tty/Editor/Editor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "../TTY/TTY.h"
#include "../Common/Macros.h"

#include "nh-core/System/Logger.h"
#include "nh-core/Logger/Logger.h"
#include "nh-core/System/Memory.h"

#include "nh-encoding/Encodings/UTF32.h"
Expand Down
2 changes: 1 addition & 1 deletion src/lib/ttyr-tty/TTY/TTY.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "nh-core/System/Thread.h"
#include "nh-core/System/Memory.h"
#include "nh-core/System/Process.h"
#include "nh-core/System/Logger.h"
#include "nh-core/Logger/Logger.h"
#include "nh-core/Util/RingBuffer.h"

#include "nh-encoding/Base/UnicodeDataHelper.h"
Expand Down

0 comments on commit 7fb2f60

Please sign in to comment.