diff options
| author | ruki <[email protected]> | 2019-06-28 00:41:09 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2019-06-27 22:06:58 +0800 |
| commit | 19cbd06f95dddacd1247d1dffab9fa29d719d02b (patch) | |
| tree | c424494f950ea356bcac5f8bdc3c78b200064c67 | |
| parent | 10f5a0cf4441565b66d9fe2682ee78fbaab73fa9 (diff) | |
rename submodules name
| -rw-r--r-- | .gitmodules | 16 | ||||
| -rw-r--r-- | core/src/demo/makefile | 2 | ||||
| -rw-r--r-- | core/src/lcurses/makefile | 2 | ||||
| m--------- | core/src/luajit/luajit (renamed from core/src/luajit/repo) | 0 | ||||
| -rw-r--r-- | core/src/luajit/makefile | 130 | ||||
| -rw-r--r-- | core/src/luajit/xmake.lua | 6 | ||||
| m--------- | core/src/pdcurses/pdcurses (renamed from core/src/pdcurses/repo) | 0 | ||||
| -rw-r--r-- | core/src/pdcurses/xmake.lua | 4 | ||||
| -rw-r--r-- | core/src/sv/makefile | 16 | ||||
| m--------- | core/src/sv/sv (renamed from core/src/sv/repo) | 0 | ||||
| -rw-r--r-- | core/src/sv/xmake.lua | 2 | ||||
| -rw-r--r-- | core/src/tbox/makefile | 486 | ||||
| m--------- | core/src/tbox/tbox (renamed from core/src/tbox/repo) | 0 | ||||
| -rw-r--r-- | core/src/tbox/xmake.lua | 2 | ||||
| -rw-r--r-- | core/src/xmake/makefile | 6 |
15 files changed, 336 insertions, 336 deletions
diff --git a/.gitmodules b/.gitmodules index f4e61592f..22ed3f533 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ -[submodule "core/src/tbox/repo"] - path = core/src/tbox/repo +[submodule "core/src/tbox/tbox"] + path = core/src/tbox/tbox url = ../../tboox/tbox.git -[submodule "core/src/luajit/repo"] - path = core/src/luajit/repo +[submodule "core/src/luajit/luajit"] + path = core/src/luajit/luajit url = ../../xmake-io/xmake-core-luajit.git -[submodule "core/src/sv/repo"] - path = core/src/sv/repo +[submodule "core/src/sv/sv"] + path = core/src/sv/sv url = ../../xmake-io/xmake-core-sv.git -[submodule "core/src/pdcurses/repo"] - path = core/src/pdcurses/repo +[submodule "core/src/pdcurses/pdcurses"] + path = core/src/pdcurses/pdcurses url = ../../xmake-io/xmake-core-pdcurses.git diff --git a/core/src/demo/makefile b/core/src/demo/makefile index 8c65a8a2c..a9c22a0e5 100644 --- a/core/src/demo/makefile +++ b/core/src/demo/makefile @@ -15,7 +15,7 @@ demo_PKGS-$(BASE) += base # others demo_LIBS += xmake$(DTYPE) lcurses$(DTYPE) tbox$(DTYPE) luajit$(DTYPE) sv$(DTYPE) -demo_INC_DIRS += ../ ../tbox/repo/src ../tbox/inc/$(PLAT) ../luajit/repo/src ../sv/repo/include +demo_INC_DIRS += ../ ../tbox/tbox/src ../tbox/inc/$(PLAT) ../luajit/luajit/src ../sv/sv/include demo_LIB_DIRS += ../xmake ../tbox ../luajit ../sv ../lcurses demo_CXFLAGS += -D__tb_prefix__=\"xmake\" diff --git a/core/src/lcurses/makefile b/core/src/lcurses/makefile index 33ac0f8a9..ac4384cb8 100644 --- a/core/src/lcurses/makefile +++ b/core/src/lcurses/makefile @@ -17,7 +17,7 @@ lcurses_C_FILES += lcurses lcurses_CXFLAGS += $(if $(findstring curses,$(base_LIBNAMES)),-DXM_CONFIG_API_HAVE_CURSES,) # includes -lcurses_INC_DIRS += ../luajit/repo/src +lcurses_INC_DIRS += ../luajit/luajit/src # suffix include $(PRO_DIR)/suffix.mak diff --git a/core/src/luajit/repo b/core/src/luajit/luajit -Subproject d1ea93d1b5d175e29af653872ec5bb77f55241a +Subproject d1ea93d1b5d175e29af653872ec5bb77f55241a diff --git a/core/src/luajit/makefile b/core/src/luajit/makefile index ba6c2fe69..a5718c165 100644 --- a/core/src/luajit/makefile +++ b/core/src/luajit/makefile @@ -12,71 +12,71 @@ luajit_CONFIG = n # core files luajit_C_FILES += \ - repo/src/lib_aux \ - repo/src/lib_base \ - repo/src/lib_bit \ - repo/src/lib_debug \ - repo/src/lib_ffi \ - repo/src/lib_init \ - repo/src/lib_io \ - repo/src/lib_jit \ - repo/src/lib_math \ - repo/src/lib_os \ - repo/src/lib_package \ - repo/src/lib_string \ - repo/src/lib_table \ - repo/src/lj_alloc \ - repo/src/lj_api \ - repo/src/lj_asm \ - repo/src/lj_bc \ - repo/src/lj_bcread \ - repo/src/lj_bcwrite \ - repo/src/lj_carith \ - repo/src/lj_ccall \ - repo/src/lj_ccallback \ - repo/src/lj_cconv \ - repo/src/lj_cdata \ - repo/src/lj_char \ - repo/src/lj_clib \ - repo/src/lj_cparse \ - repo/src/lj_crecord \ - repo/src/lj_ctype \ - repo/src/lj_debug \ - repo/src/lj_dispatch \ - repo/src/lj_err \ - repo/src/lj_ffrecord \ - repo/src/lj_func \ - repo/src/lj_gc \ - repo/src/lj_gdbjit \ - repo/src/lj_ir \ - repo/src/lj_lex \ - repo/src/lj_lib \ - repo/src/lj_load \ - repo/src/lj_mcode \ - repo/src/lj_meta \ - repo/src/lj_obj \ - repo/src/lj_opt_dce \ - repo/src/lj_opt_fold \ - repo/src/lj_opt_loop \ - repo/src/lj_opt_mem \ - repo/src/lj_opt_narrow \ - repo/src/lj_opt_sink \ - repo/src/lj_opt_split \ - repo/src/lj_parse \ - repo/src/lj_record \ - repo/src/lj_snap \ - repo/src/lj_state \ - repo/src/lj_str \ - repo/src/lj_strscan \ - repo/src/lj_tab \ - repo/src/lj_trace \ - repo/src/lj_udata \ - repo/src/lj_vmevent \ - repo/src/lj_vmmath \ - repo/src/lj_buf \ - repo/src/lj_strfmt \ - repo/src/lj_strfmt_num \ - repo/src/lj_profile + luajit/src/lib_aux \ + luajit/src/lib_base \ + luajit/src/lib_bit \ + luajit/src/lib_debug \ + luajit/src/lib_ffi \ + luajit/src/lib_init \ + luajit/src/lib_io \ + luajit/src/lib_jit \ + luajit/src/lib_math \ + luajit/src/lib_os \ + luajit/src/lib_package \ + luajit/src/lib_string \ + luajit/src/lib_table \ + luajit/src/lj_alloc \ + luajit/src/lj_api \ + luajit/src/lj_asm \ + luajit/src/lj_bc \ + luajit/src/lj_bcread \ + luajit/src/lj_bcwrite \ + luajit/src/lj_carith \ + luajit/src/lj_ccall \ + luajit/src/lj_ccallback \ + luajit/src/lj_cconv \ + luajit/src/lj_cdata \ + luajit/src/lj_char \ + luajit/src/lj_clib \ + luajit/src/lj_cparse \ + luajit/src/lj_crecord \ + luajit/src/lj_ctype \ + luajit/src/lj_debug \ + luajit/src/lj_dispatch \ + luajit/src/lj_err \ + luajit/src/lj_ffrecord \ + luajit/src/lj_func \ + luajit/src/lj_gc \ + luajit/src/lj_gdbjit \ + luajit/src/lj_ir \ + luajit/src/lj_lex \ + luajit/src/lj_lib \ + luajit/src/lj_load \ + luajit/src/lj_mcode \ + luajit/src/lj_meta \ + luajit/src/lj_obj \ + luajit/src/lj_opt_dce \ + luajit/src/lj_opt_fold \ + luajit/src/lj_opt_loop \ + luajit/src/lj_opt_mem \ + luajit/src/lj_opt_narrow \ + luajit/src/lj_opt_sink \ + luajit/src/lj_opt_split \ + luajit/src/lj_parse \ + luajit/src/lj_record \ + luajit/src/lj_snap \ + luajit/src/lj_state \ + luajit/src/lj_str \ + luajit/src/lj_strscan \ + luajit/src/lj_tab \ + luajit/src/lj_trace \ + luajit/src/lj_udata \ + luajit/src/lj_vmevent \ + luajit/src/lj_vmmath \ + luajit/src/lj_buf \ + luajit/src/lj_strfmt \ + luajit/src/lj_strfmt_num \ + luajit/src/lj_profile # asm files ifeq ($(PLAT),windows) diff --git a/core/src/luajit/xmake.lua b/core/src/luajit/xmake.lua index ee099019c..ccf385cc9 100644 --- a/core/src/luajit/xmake.lua +++ b/core/src/luajit/xmake.lua @@ -21,14 +21,14 @@ target("luajit") end -- add header files - add_headerfiles("repo/src/(*.h)") + add_headerfiles("luajit/src/(*.h)") -- add include directories add_includedirs(autogendir) - add_includedirs("repo/src", {public = true}) + add_includedirs("luajit/src", {public = true}) -- add the common source files - add_files("repo/src/*.c|ljamalg.c|luajit.c") + add_files("luajit/src/*.c|ljamalg.c|luajit.c") if is_plat("windows") then add_files(autogendir .. "/lj_vm.obj") else diff --git a/core/src/pdcurses/repo b/core/src/pdcurses/pdcurses -Subproject 46d2c800bee8b5c1a51a9dfbbbc77461e98b9ec +Subproject 46d2c800bee8b5c1a51a9dfbbbc77461e98b9ec diff --git a/core/src/pdcurses/xmake.lua b/core/src/pdcurses/xmake.lua index d23a7c1aa..865d20351 100644 --- a/core/src/pdcurses/xmake.lua +++ b/core/src/pdcurses/xmake.lua @@ -5,10 +5,10 @@ target("pdcurses") set_kind("static") -- add includes directory - add_includedirs("repo", {public = true}) + add_includedirs("pdcurses", {public = true}) -- add the common source files - add_files("repo/pdcurses/*.c", "repo/win32/*.c") + add_files("pdcurses/pdcurses/*.c", "pdcurses/win32/*.c") -- add defines add_defines("PDC_WIDE") diff --git a/core/src/sv/makefile b/core/src/sv/makefile index c760f44c1..e1197c612 100644 --- a/core/src/sv/makefile +++ b/core/src/sv/makefile @@ -12,16 +12,16 @@ sv_CONFIG = n # core files sv_C_FILES += \ - repo/src/comp \ - repo/src/id \ - repo/src/num \ - repo/src/range \ - repo/src/semvers \ - repo/src/utils \ - repo/src/version + sv/src/comp \ + sv/src/id \ + sv/src/num \ + sv/src/range \ + sv/src/semvers \ + sv/src/utils \ + sv/src/version # includes -sv_INC_DIRS += repo/include +sv_INC_DIRS += sv/include # suffix diff --git a/core/src/sv/repo b/core/src/sv/sv -Subproject b991eb0d5d99f5db9695e5a3ac15820b38df0f5 +Subproject b991eb0d5d99f5db9695e5a3ac15820b38df0f5 diff --git a/core/src/sv/xmake.lua b/core/src/sv/xmake.lua index 6de7d4b9d..32d1849f5 100644 --- a/core/src/sv/xmake.lua +++ b/core/src/sv/xmake.lua @@ -1 +1 @@ -includes("repo") +includes("sv") diff --git a/core/src/tbox/makefile b/core/src/tbox/makefile index 7615a13d3..11038c4e4 100644 --- a/core/src/tbox/makefile +++ b/core/src/tbox/makefile @@ -12,252 +12,252 @@ tbox_CONFIG = n # core files tbox_C_FILES += \ - repo/src/tbox/tbox \ - repo/src/tbox/hash/bkdr \ - repo/src/tbox/hash/fnv32 \ - repo/src/tbox/hash/adler32 \ - repo/src/tbox/math/impl/math \ - repo/src/tbox/math/random/linear \ - repo/src/tbox/math/random/random \ - repo/src/tbox/libc/impl/libc \ - repo/src/tbox/libc/misc/time/gmmktime \ - repo/src/tbox/libc/misc/time/gmtime \ - repo/src/tbox/libc/misc/time/localtime \ - repo/src/tbox/libc/misc/time/mktime \ - repo/src/tbox/libc/misc/time/time \ - repo/src/tbox/libc/stdio/printf \ - repo/src/tbox/libc/stdio/printf_object \ - repo/src/tbox/libc/stdio/puts \ - repo/src/tbox/libc/stdio/snprintf \ - repo/src/tbox/libc/stdio/sprintf \ - repo/src/tbox/libc/stdio/swprintf \ - repo/src/tbox/libc/stdio/vsnprintf \ - repo/src/tbox/libc/stdio/vswprintf \ - repo/src/tbox/libc/stdio/wprintf \ - repo/src/tbox/libc/stdio/wputs \ - repo/src/tbox/libc/stdlib/mbstowcs \ - repo/src/tbox/libc/stdlib/random \ - repo/src/tbox/libc/stdlib/stdlib \ - repo/src/tbox/libc/stdlib/wcstombs \ - repo/src/tbox/libc/string/memcmp \ - repo/src/tbox/libc/string/memcpy \ - repo/src/tbox/libc/string/memdup \ - repo/src/tbox/libc/string/memmem \ - repo/src/tbox/libc/string/memmov \ - repo/src/tbox/libc/string/memset \ - repo/src/tbox/libc/string/strcat \ - repo/src/tbox/libc/string/strchr \ - repo/src/tbox/libc/string/strcmp \ - repo/src/tbox/libc/string/strcpy \ - repo/src/tbox/libc/string/strdup \ - repo/src/tbox/libc/string/strichr \ - repo/src/tbox/libc/string/stricmp \ - repo/src/tbox/libc/string/strirchr \ - repo/src/tbox/libc/string/strirstr \ - repo/src/tbox/libc/string/stristr \ - repo/src/tbox/libc/string/strlcpy \ - repo/src/tbox/libc/string/strlen \ - repo/src/tbox/libc/string/strncat \ - repo/src/tbox/libc/string/strncmp \ - repo/src/tbox/libc/string/strncpy \ - repo/src/tbox/libc/string/strndup \ - repo/src/tbox/libc/string/strnicmp \ - repo/src/tbox/libc/string/strnirchr \ - repo/src/tbox/libc/string/strnirstr \ - repo/src/tbox/libc/string/strnistr \ - repo/src/tbox/libc/string/strnlen \ - repo/src/tbox/libc/string/strnrchr \ - repo/src/tbox/libc/string/strnrstr \ - repo/src/tbox/libc/string/strnstr \ - repo/src/tbox/libc/string/strrchr \ - repo/src/tbox/libc/string/strrstr \ - repo/src/tbox/libc/string/strstr \ - repo/src/tbox/libc/string/wcscat \ - repo/src/tbox/libc/string/wcschr \ - repo/src/tbox/libc/string/wcscmp \ - repo/src/tbox/libc/string/wcscpy \ - repo/src/tbox/libc/string/wcsdup \ - repo/src/tbox/libc/string/wcsichr \ - repo/src/tbox/libc/string/wcsicmp \ - repo/src/tbox/libc/string/wcsirchr \ - repo/src/tbox/libc/string/wcsirstr \ - repo/src/tbox/libc/string/wcsistr \ - repo/src/tbox/libc/string/wcslcpy \ - repo/src/tbox/libc/string/wcslen \ - repo/src/tbox/libc/string/wcsncat \ - repo/src/tbox/libc/string/wcsncmp \ - repo/src/tbox/libc/string/wcsncpy \ - repo/src/tbox/libc/string/wcsndup \ - repo/src/tbox/libc/string/wcsnicmp \ - repo/src/tbox/libc/string/wcsnirchr \ - repo/src/tbox/libc/string/wcsnirstr \ - repo/src/tbox/libc/string/wcsnlen \ - repo/src/tbox/libc/string/wcsnrchr \ - repo/src/tbox/libc/string/wcsnrstr \ - repo/src/tbox/libc/string/wcsrchr \ - repo/src/tbox/libc/string/wcsrstr \ - repo/src/tbox/libc/string/wcsstr \ - repo/src/tbox/utils/base32 \ - repo/src/tbox/utils/base64 \ - repo/src/tbox/utils/bits \ - repo/src/tbox/utils/dump \ - repo/src/tbox/utils/lock_profiler \ - repo/src/tbox/utils/singleton \ - repo/src/tbox/utils/trace \ - repo/src/tbox/utils/url \ - repo/src/tbox/utils/used \ - repo/src/tbox/prefix/state \ - repo/src/tbox/memory/allocator \ - repo/src/tbox/memory/buffer \ - repo/src/tbox/memory/default_allocator \ - repo/src/tbox/memory/fixed_pool \ - repo/src/tbox/memory/impl/memory \ - repo/src/tbox/memory/impl/native_large_allocator \ - repo/src/tbox/memory/impl/prefix \ - repo/src/tbox/memory/impl/static_fixed_pool \ - repo/src/tbox/memory/impl/static_large_allocator \ - repo/src/tbox/memory/large_allocator \ - repo/src/tbox/memory/native_allocator \ - repo/src/tbox/memory/queue_buffer \ - repo/src/tbox/memory/small_allocator \ - repo/src/tbox/memory/static_allocator \ - repo/src/tbox/memory/static_buffer \ - repo/src/tbox/memory/string_pool \ - repo/src/tbox/string/static_string \ - repo/src/tbox/string/string \ - repo/src/tbox/stream/filter \ - repo/src/tbox/stream/impl/filter/cache \ - repo/src/tbox/stream/impl/filter/chunked \ - repo/src/tbox/stream/impl/stream/data \ - repo/src/tbox/stream/impl/stream/file \ - repo/src/tbox/stream/impl/stream/filter \ - repo/src/tbox/stream/impl/stream/http \ - repo/src/tbox/stream/impl/stream/sock \ - repo/src/tbox/stream/static_stream \ - repo/src/tbox/stream/stream \ - repo/src/tbox/stream/transfer \ - repo/src/tbox/network/cookies \ - repo/src/tbox/network/dns/cache \ - repo/src/tbox/network/dns/looker \ - repo/src/tbox/network/dns/server \ - repo/src/tbox/network/http \ - repo/src/tbox/network/hwaddr \ - repo/src/tbox/network/impl/http/date \ - repo/src/tbox/network/impl/http/method \ - repo/src/tbox/network/impl/http/option \ - repo/src/tbox/network/impl/http/status \ - repo/src/tbox/network/impl/network \ - repo/src/tbox/network/ipaddr \ - repo/src/tbox/network/ipv4 \ - repo/src/tbox/network/ipv6 \ - repo/src/tbox/network/url \ - repo/src/tbox/algorithm/binary_find \ - repo/src/tbox/algorithm/binary_find_if \ - repo/src/tbox/algorithm/bubble_sort \ - repo/src/tbox/algorithm/count \ - repo/src/tbox/algorithm/count_if \ - repo/src/tbox/algorithm/distance \ - repo/src/tbox/algorithm/find \ - repo/src/tbox/algorithm/find_if \ - repo/src/tbox/algorithm/heap_sort \ - repo/src/tbox/algorithm/insert_sort \ - repo/src/tbox/algorithm/predicate \ - repo/src/tbox/algorithm/quick_sort \ - repo/src/tbox/algorithm/remove \ - repo/src/tbox/algorithm/remove_first \ - repo/src/tbox/algorithm/remove_first_if \ - repo/src/tbox/algorithm/remove_if \ - repo/src/tbox/algorithm/rfind \ - repo/src/tbox/algorithm/rfind_if \ - repo/src/tbox/algorithm/rwalk \ - repo/src/tbox/algorithm/sort \ - repo/src/tbox/algorithm/walk \ - repo/src/tbox/container/bloom_filter \ - repo/src/tbox/container/circle_queue \ - repo/src/tbox/container/element/hash \ - repo/src/tbox/container/element/long \ - repo/src/tbox/container/element/mem \ - repo/src/tbox/container/element/null \ - repo/src/tbox/container/element/ptr \ - repo/src/tbox/container/element/size \ - repo/src/tbox/container/element/str \ - repo/src/tbox/container/element/true \ - repo/src/tbox/container/element/uint16 \ - repo/src/tbox/container/element/uint32 \ - repo/src/tbox/container/element/uint8 \ - repo/src/tbox/container/hash_map \ - repo/src/tbox/container/hash_set \ - repo/src/tbox/container/heap \ - repo/src/tbox/container/array_iterator \ - repo/src/tbox/container/iterator \ - repo/src/tbox/container/list \ - repo/src/tbox/container/list_entry \ - repo/src/tbox/container/priority_queue \ - repo/src/tbox/container/queue \ - repo/src/tbox/container/single_list \ - repo/src/tbox/container/single_list_entry \ - repo/src/tbox/container/stack \ - repo/src/tbox/container/vector \ - repo/src/tbox/libm/impl/libm \ - repo/src/tbox/libm/ilog2i \ - repo/src/tbox/libm/isqrti \ - repo/src/tbox/libm/idivi8 \ - repo/src/tbox/platform/addrinfo \ - repo/src/tbox/platform/atomic64 \ - repo/src/tbox/platform/backtrace \ - repo/src/tbox/platform/cache_time \ - repo/src/tbox/platform/directory \ - repo/src/tbox/platform/dynamic \ - repo/src/tbox/platform/environment \ - repo/src/tbox/platform/event \ - repo/src/tbox/platform/file \ - repo/src/tbox/platform/hostname \ - repo/src/tbox/platform/ifaddrs \ - repo/src/tbox/platform/ltimer \ - repo/src/tbox/platform/memory \ - repo/src/tbox/platform/mutex \ - repo/src/tbox/platform/page \ - repo/src/tbox/platform/path \ - repo/src/tbox/platform/poller \ - repo/src/tbox/platform/print \ - repo/src/tbox/platform/process \ - repo/src/tbox/platform/processor \ - repo/src/tbox/platform/sched \ - repo/src/tbox/platform/semaphore \ - repo/src/tbox/platform/socket \ - repo/src/tbox/platform/syserror \ - repo/src/tbox/platform/thread \ - repo/src/tbox/platform/thread_local \ - repo/src/tbox/platform/time \ - repo/src/tbox/platform/timer \ - repo/src/tbox/platform/impl/sockdata \ - repo/src/tbox/platform/impl/dns \ - repo/src/tbox/platform/impl/platform \ - repo/src/tbox/libm/isfin \ - repo/src/tbox/libm/isfinf \ - repo/src/tbox/libm/isinf \ - repo/src/tbox/libm/isinff \ - repo/src/tbox/libm/isnan \ - repo/src/tbox/libm/isnanf \ - repo/src/tbox/libm/pow \ - repo/src/tbox/libm/cos \ - repo/src/tbox/libm/cosf \ - repo/src/tbox/libm/sqrtf \ - repo/src/tbox/hash/sha \ - repo/src/tbox/hash/uuid \ - repo/src/tbox/charset/charset \ - repo/src/tbox/charset/ascii \ - repo/src/tbox/charset/gb2312 \ - repo/src/tbox/charset/utf8 \ - repo/src/tbox/charset/utf16 \ - repo/src/tbox/charset/utf32 \ - repo/src/tbox/charset/ucs2 \ - repo/src/tbox/charset/ucs4 \ - repo/src/tbox/charset/iso8859 + tbox/src/tbox/tbox \ + tbox/src/tbox/hash/bkdr \ + tbox/src/tbox/hash/fnv32 \ + tbox/src/tbox/hash/adler32 \ + tbox/src/tbox/math/impl/math \ + tbox/src/tbox/math/random/linear \ + tbox/src/tbox/math/random/random \ + tbox/src/tbox/libc/impl/libc \ + tbox/src/tbox/libc/misc/time/gmmktime \ + tbox/src/tbox/libc/misc/time/gmtime \ + tbox/src/tbox/libc/misc/time/localtime \ + tbox/src/tbox/libc/misc/time/mktime \ + tbox/src/tbox/libc/misc/time/time \ + tbox/src/tbox/libc/stdio/printf \ + tbox/src/tbox/libc/stdio/printf_object \ + tbox/src/tbox/libc/stdio/puts \ + tbox/src/tbox/libc/stdio/snprintf \ + tbox/src/tbox/libc/stdio/sprintf \ + tbox/src/tbox/libc/stdio/swprintf \ + tbox/src/tbox/libc/stdio/vsnprintf \ + tbox/src/tbox/libc/stdio/vswprintf \ + tbox/src/tbox/libc/stdio/wprintf \ + tbox/src/tbox/libc/stdio/wputs \ + tbox/src/tbox/libc/stdlib/mbstowcs \ + tbox/src/tbox/libc/stdlib/random \ + tbox/src/tbox/libc/stdlib/stdlib \ + tbox/src/tbox/libc/stdlib/wcstombs \ + tbox/src/tbox/libc/string/memcmp \ + tbox/src/tbox/libc/string/memcpy \ + tbox/src/tbox/libc/string/memdup \ + tbox/src/tbox/libc/string/memmem \ + tbox/src/tbox/libc/string/memmov \ + tbox/src/tbox/libc/string/memset \ + tbox/src/tbox/libc/string/strcat \ + tbox/src/tbox/libc/string/strchr \ + tbox/src/tbox/libc/string/strcmp \ + tbox/src/tbox/libc/string/strcpy \ + tbox/src/tbox/libc/string/strdup \ + tbox/src/tbox/libc/string/strichr \ + tbox/src/tbox/libc/string/stricmp \ + tbox/src/tbox/libc/string/strirchr \ + tbox/src/tbox/libc/string/strirstr \ + tbox/src/tbox/libc/string/stristr \ + tbox/src/tbox/libc/string/strlcpy \ + tbox/src/tbox/libc/string/strlen \ + tbox/src/tbox/libc/string/strncat \ + tbox/src/tbox/libc/string/strncmp \ + tbox/src/tbox/libc/string/strncpy \ + tbox/src/tbox/libc/string/strndup \ + tbox/src/tbox/libc/string/strnicmp \ + tbox/src/tbox/libc/string/strnirchr \ + tbox/src/tbox/libc/string/strnirstr \ + tbox/src/tbox/libc/string/strnistr \ + tbox/src/tbox/libc/string/strnlen \ + tbox/src/tbox/libc/string/strnrchr \ + tbox/src/tbox/libc/string/strnrstr \ + tbox/src/tbox/libc/string/strnstr \ + tbox/src/tbox/libc/string/strrchr \ + tbox/src/tbox/libc/string/strrstr \ + tbox/src/tbox/libc/string/strstr \ + tbox/src/tbox/libc/string/wcscat \ + tbox/src/tbox/libc/string/wcschr \ + tbox/src/tbox/libc/string/wcscmp \ + tbox/src/tbox/libc/string/wcscpy \ + tbox/src/tbox/libc/string/wcsdup \ + tbox/src/tbox/libc/string/wcsichr \ + tbox/src/tbox/libc/string/wcsicmp \ + tbox/src/tbox/libc/string/wcsirchr \ + tbox/src/tbox/libc/string/wcsirstr \ + tbox/src/tbox/libc/string/wcsistr \ + tbox/src/tbox/libc/string/wcslcpy \ + tbox/src/tbox/libc/string/wcslen \ + tbox/src/tbox/libc/string/wcsncat \ + tbox/src/tbox/libc/string/wcsncmp \ + tbox/src/tbox/libc/string/wcsncpy \ + tbox/src/tbox/libc/string/wcsndup \ + tbox/src/tbox/libc/string/wcsnicmp \ + tbox/src/tbox/libc/string/wcsnirchr \ + tbox/src/tbox/libc/string/wcsnirstr \ + tbox/src/tbox/libc/string/wcsnlen \ + tbox/src/tbox/libc/string/wcsnrchr \ + tbox/src/tbox/libc/string/wcsnrstr \ + tbox/src/tbox/libc/string/wcsrchr \ + tbox/src/tbox/libc/string/wcsrstr \ + tbox/src/tbox/libc/string/wcsstr \ + tbox/src/tbox/utils/base32 \ + tbox/src/tbox/utils/base64 \ + tbox/src/tbox/utils/bits \ + tbox/src/tbox/utils/dump \ + tbox/src/tbox/utils/lock_profiler \ + tbox/src/tbox/utils/singleton \ + tbox/src/tbox/utils/trace \ + tbox/src/tbox/utils/url \ + tbox/src/tbox/utils/used \ + tbox/src/tbox/prefix/state \ + tbox/src/tbox/memory/allocator \ + tbox/src/tbox/memory/buffer \ + tbox/src/tbox/memory/default_allocator \ + tbox/src/tbox/memory/fixed_pool \ + tbox/src/tbox/memory/impl/memory \ + tbox/src/tbox/memory/impl/native_large_allocator \ + tbox/src/tbox/memory/impl/prefix \ + tbox/src/tbox/memory/impl/static_fixed_pool \ + tbox/src/tbox/memory/impl/static_large_allocator \ + tbox/src/tbox/memory/large_allocator \ + tbox/src/tbox/memory/native_allocator \ + tbox/src/tbox/memory/queue_buffer \ + tbox/src/tbox/memory/small_allocator \ + tbox/src/tbox/memory/static_allocator \ + tbox/src/tbox/memory/static_buffer \ + tbox/src/tbox/memory/string_pool \ + tbox/src/tbox/string/static_string \ + tbox/src/tbox/string/string \ + tbox/src/tbox/stream/filter \ + tbox/src/tbox/stream/impl/filter/cache \ + tbox/src/tbox/stream/impl/filter/chunked \ + tbox/src/tbox/stream/impl/stream/data \ + tbox/src/tbox/stream/impl/stream/file \ + tbox/src/tbox/stream/impl/stream/filter \ + tbox/src/tbox/stream/impl/stream/http \ + tbox/src/tbox/stream/impl/stream/sock \ + tbox/src/tbox/stream/static_stream \ + tbox/src/tbox/stream/stream \ + tbox/src/tbox/stream/transfer \ + tbox/src/tbox/network/cookies \ + tbox/src/tbox/network/dns/cache \ + tbox/src/tbox/network/dns/looker \ + tbox/src/tbox/network/dns/server \ + tbox/src/tbox/network/http \ + tbox/src/tbox/network/hwaddr \ + tbox/src/tbox/network/impl/http/date \ + tbox/src/tbox/network/impl/http/method \ + tbox/src/tbox/network/impl/http/option \ + tbox/src/tbox/network/impl/http/status \ + tbox/src/tbox/network/impl/network \ + tbox/src/tbox/network/ipaddr \ + tbox/src/tbox/network/ipv4 \ + tbox/src/tbox/network/ipv6 \ + tbox/src/tbox/network/url \ + tbox/src/tbox/algorithm/binary_find \ + tbox/src/tbox/algorithm/binary_find_if \ + tbox/src/tbox/algorithm/bubble_sort \ + tbox/src/tbox/algorithm/count \ + tbox/src/tbox/algorithm/count_if \ + tbox/src/tbox/algorithm/distance \ + tbox/src/tbox/algorithm/find \ + tbox/src/tbox/algorithm/find_if \ + tbox/src/tbox/algorithm/heap_sort \ + tbox/src/tbox/algorithm/insert_sort \ + tbox/src/tbox/algorithm/predicate \ + tbox/src/tbox/algorithm/quick_sort \ + tbox/src/tbox/algorithm/remove \ + tbox/src/tbox/algorithm/remove_first \ + tbox/src/tbox/algorithm/remove_first_if \ + tbox/src/tbox/algorithm/remove_if \ + tbox/src/tbox/algorithm/rfind \ + tbox/src/tbox/algorithm/rfind_if \ + tbox/src/tbox/algorithm/rwalk \ + tbox/src/tbox/algorithm/sort \ + tbox/src/tbox/algorithm/walk \ + tbox/src/tbox/container/bloom_filter \ + tbox/src/tbox/container/circle_queue \ + tbox/src/tbox/container/element/hash \ + tbox/src/tbox/container/element/long \ + tbox/src/tbox/container/element/mem \ + tbox/src/tbox/container/element/null \ + tbox/src/tbox/container/element/ptr \ + tbox/src/tbox/container/element/size \ + tbox/src/tbox/container/element/str \ + tbox/src/tbox/container/element/true \ + tbox/src/tbox/container/element/uint16 \ + tbox/src/tbox/container/element/uint32 \ + tbox/src/tbox/container/element/uint8 \ + tbox/src/tbox/container/hash_map \ + tbox/src/tbox/container/hash_set \ + tbox/src/tbox/container/heap \ + tbox/src/tbox/container/array_iterator \ + tbox/src/tbox/container/iterator \ + tbox/src/tbox/container/list \ + tbox/src/tbox/container/list_entry \ + tbox/src/tbox/container/priority_queue \ + tbox/src/tbox/container/queue \ + tbox/src/tbox/container/single_list \ + tbox/src/tbox/container/single_list_entry \ + tbox/src/tbox/container/stack \ + tbox/src/tbox/container/vector \ + tbox/src/tbox/libm/impl/libm \ + tbox/src/tbox/libm/ilog2i \ + tbox/src/tbox/libm/isqrti \ + tbox/src/tbox/libm/idivi8 \ + tbox/src/tbox/platform/addrinfo \ + tbox/src/tbox/platform/atomic64 \ + tbox/src/tbox/platform/backtrace \ + tbox/src/tbox/platform/cache_time \ + tbox/src/tbox/platform/directory \ + tbox/src/tbox/platform/dynamic \ + tbox/src/tbox/platform/environment \ + tbox/src/tbox/platform/event \ + tbox/src/tbox/platform/file \ + tbox/src/tbox/platform/hostname \ + tbox/src/tbox/platform/ifaddrs \ + tbox/src/tbox/platform/ltimer \ + tbox/src/tbox/platform/memory \ + tbox/src/tbox/platform/mutex \ + tbox/src/tbox/platform/page \ + tbox/src/tbox/platform/path \ + tbox/src/tbox/platform/poller \ + tbox/src/tbox/platform/print \ + tbox/src/tbox/platform/process \ + tbox/src/tbox/platform/processor \ + tbox/src/tbox/platform/sched \ + tbox/src/tbox/platform/semaphore \ + tbox/src/tbox/platform/socket \ + tbox/src/tbox/platform/syserror \ + tbox/src/tbox/platform/thread \ + tbox/src/tbox/platform/thread_local \ + tbox/src/tbox/platform/time \ + tbox/src/tbox/platform/timer \ + tbox/src/tbox/platform/impl/sockdata \ + tbox/src/tbox/platform/impl/dns \ + tbox/src/tbox/platform/impl/platform \ + tbox/src/tbox/libm/isfin \ + tbox/src/tbox/libm/isfinf \ + tbox/src/tbox/libm/isinf \ + tbox/src/tbox/libm/isinff \ + tbox/src/tbox/libm/isnan \ + tbox/src/tbox/libm/isnanf \ + tbox/src/tbox/libm/pow \ + tbox/src/tbox/libm/cos \ + tbox/src/tbox/libm/cosf \ + tbox/src/tbox/libm/sqrtf \ + tbox/src/tbox/hash/sha \ + tbox/src/tbox/hash/uuid \ + tbox/src/tbox/charset/charset \ + tbox/src/tbox/charset/ascii \ + tbox/src/tbox/charset/gb2312 \ + tbox/src/tbox/charset/utf8 \ + tbox/src/tbox/charset/utf16 \ + tbox/src/tbox/charset/utf32 \ + tbox/src/tbox/charset/ucs2 \ + tbox/src/tbox/charset/ucs4 \ + tbox/src/tbox/charset/iso8859 # includes tbox_INC_DIRS += \ - repo/src \ + tbox/src \ inc/$(PLAT) diff --git a/core/src/tbox/repo b/core/src/tbox/tbox -Subproject ad025d12b7dfc9a993da2c7a75bd1e9cd70bd57 +Subproject ad025d12b7dfc9a993da2c7a75bd1e9cd70bd57 diff --git a/core/src/tbox/xmake.lua b/core/src/tbox/xmake.lua index ef6fb2e05..563fd12d5 100644 --- a/core/src/tbox/xmake.lua +++ b/core/src/tbox/xmake.lua @@ -1,4 +1,4 @@ -includes("repo") +includes("tbox") -- enable hash, charset modules for _, name in ipairs({"hash", "charset"}) do diff --git a/core/src/xmake/makefile b/core/src/xmake/makefile index b65318346..b51504cee 100644 --- a/core/src/xmake/makefile +++ b/core/src/xmake/makefile @@ -78,10 +78,10 @@ xmake_CXFLAGS += $(if $(findstring curses,$(base_LIBNAMES)),-DXM_CONFIG # includes xmake_INC_DIRS += \ - ../tbox/repo/src \ + ../tbox/tbox/src \ ../tbox/inc/$(PLAT) \ - ../luajit/repo/src \ - ../sv/repo/include + ../luajit/luajit/src \ + ../sv/sv/include # suffix |
