diff options
| author | ruki <[email protected]> | 2022-07-23 00:32:08 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-07-23 00:32:08 +0800 |
| commit | 5b194189014255d7d6bed74531e4610b45f2fe34 (patch) | |
| tree | 35c806a8604338ce097397e197b8d8293aa5d5bd | |
| parent | f84814e6c98db75e538007cebd7edee34710b275 (diff) | |
update tbox
| -rw-r--r-- | core/plat/macosx/prefix.mak | 2 | ||||
| -rwxr-xr-x | core/src/tbox/inc/linux/tbox.config.h | 3 | ||||
| -rw-r--r-- | core/src/tbox/makefile | 4 | ||||
| m--------- | core/src/tbox/tbox | 0 |
4 files changed, 8 insertions, 1 deletions
diff --git a/core/plat/macosx/prefix.mak b/core/plat/macosx/prefix.mak index 15bf938b9..706772631 100644 --- a/core/plat/macosx/prefix.mak +++ b/core/plat/macosx/prefix.mak @@ -130,7 +130,7 @@ MMFLAGS = LDFLAGS_ARCH := $(if $(findstring arm64,$(BUILD_ARCH)),,-pagezero_size 10000 -image_base 100000000) LDFLAGS_RELEASE = -flto LDFLAGS_DEBUG = -LDFLAGS = -m$(BITS) -all_load $(LDFLAGS_ARCH) -mmacosx-version-min=10.7 +LDFLAGS = -m$(BITS) -all_load $(LDFLAGS_ARCH) -mmacosx-version-min=10.7 -framework CoreFoundation -framework CoreServices LDFLAGS-L = -L LDFLAGS-l = -l LDFLAGS-f = diff --git a/core/src/tbox/inc/linux/tbox.config.h b/core/src/tbox/inc/linux/tbox.config.h index d3e16a6a3..b5e0faa7f 100755 --- a/core/src/tbox/inc/linux/tbox.config.h +++ b/core/src/tbox/inc/linux/tbox.config.h @@ -203,4 +203,7 @@ // valgrind functions /* #undef TB_CONFIG_SYSTEMV_HAVE_VALGRIND_STACK_REGISTER */ +// linux functions +#define TB_CONFIG_LINUX_HAVE_INOTIFY_INIT 1 + #endif diff --git a/core/src/tbox/makefile b/core/src/tbox/makefile index f24303eb1..d361fc860 100644 --- a/core/src/tbox/makefile +++ b/core/src/tbox/makefile @@ -229,6 +229,7 @@ tbox_C_FILES += \ tbox/src/tbox/platform/print \ tbox/src/tbox/platform/stdfile \ tbox/src/tbox/platform/process \ + tbox/src/tbox/platform/fwatcher \ tbox/src/tbox/platform/cpu \ tbox/src/tbox/platform/sched \ tbox/src/tbox/platform/semaphore \ @@ -302,6 +303,9 @@ tbox_INC_DIRS += \ tbox/src \ inc/$(PLAT) +# add frameworks +tbox_CFLAGS += -framework CoreFoundation -framework CoreServices + # use system tbox library? tbox_C_FILES := $(if $(findstring tbox,$(base_LIBNAMES)),,$(tbox_C_FILES)) tbox_M_FILES := $(if $(findstring tbox,$(base_LIBNAMES)),,$(tbox_M_FILES)) diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox -Subproject 0cdd892038242128bbefa4f00dcb4cc451c751d +Subproject 138ea23adf94e2ef4f7db7984fe432872abf3b5 |