From 9848eafecf2bc16f89ed51849aa0e4fd1687b7b5 Mon Sep 17 00:00:00 2001 From: xiyoo0812 Date: Wed, 8 May 2024 11:28:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/luabus/luabus.mak | 22 +-- core/quanta/quanta.mak | 4 +- extend/laoi/laoi.mak | 2 +- extend/lbson/lbson.mak | 2 +- extend/lcodec/lcodec.mak | 2 +- extend/ldetour/ldetour.mak | 18 +-- extend/ljson/ljson.mak | 4 +- extend/lmake/tmpl/make.tpl | 3 +- extend/lmdb/lmdb.mak | 6 +- extend/lminiz/lminiz.mak | 4 +- extend/lsqlite/lsqlite.mak | 6 +- extend/lssl/lssl.mak | 224 +++++++++++++++---------------- extend/lstdfs/lstdfs.mak | 2 +- extend/ltimer/ltimer.mak | 2 +- extend/lua/lua.mak | 2 +- extend/lua/luac.mak | 2 +- extend/lua/lualib.mak | 2 +- extend/luakit/include/lua_base.h | 5 +- extend/lualog/lualog.mak | 4 +- extend/luapb/luapb.mak | 2 +- extend/luaxlsx/luaxlsx.mak | 6 +- extend/luaxml/luaxml.mak | 4 +- extend/lunqlite/lunqlite.mak | 4 +- extend/lworker/lworker.mak | 2 +- extend/mimalloc/mimalloc.mak | 32 ++--- 25 files changed, 184 insertions(+), 182 deletions(-) diff --git a/core/luabus/luabus.mak b/core/luabus/luabus.mak index 4f30ee17..af6cb5f5 100644 --- a/core/luabus/luabus.mak +++ b/core/luabus/luabus.mak @@ -94,17 +94,17 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += src\lua_socket_mgr.cpp -SOURCES += src\lua_socket_node.cpp -SOURCES += src\luabus.cpp -SOURCES += src\socket_helper.cpp -SOURCES += src\socket_listener.cpp -SOURCES += src\socket_mgr.cpp -SOURCES += src\socket_router.cpp -SOURCES += src\socket_stream.cpp -SOURCES += src\socket_tcp.cpp -SOURCES += src\socket_udp.cpp -SOURCES += src\stdafx.cpp +SOURCES += src/lua_socket_mgr.cpp +SOURCES += src/lua_socket_node.cpp +SOURCES += src/luabus.cpp +SOURCES += src/socket_helper.cpp +SOURCES += src/socket_listener.cpp +SOURCES += src/socket_mgr.cpp +SOURCES += src/socket_router.cpp +SOURCES += src/socket_stream.cpp +SOURCES += src/socket_tcp.cpp +SOURCES += src/socket_udp.cpp +SOURCES += src/stdafx.cpp CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/core/quanta/quanta.mak b/core/quanta/quanta.mak index ce022d28..a6c9754f 100644 --- a/core/quanta/quanta.mak +++ b/core/quanta/quanta.mak @@ -90,8 +90,8 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += src\main.cpp -SOURCES += src\quanta.cpp +SOURCES += src/main.cpp +SOURCES += src/quanta.cpp CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/laoi/laoi.mak b/extend/laoi/laoi.mak index 638667b4..6c8d291e 100644 --- a/extend/laoi/laoi.mak +++ b/extend/laoi/laoi.mak @@ -93,7 +93,7 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += src\laoi.cpp +SOURCES += src/laoi.cpp CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/lbson/lbson.mak b/extend/lbson/lbson.mak index bf699606..93b40062 100644 --- a/extend/lbson/lbson.mak +++ b/extend/lbson/lbson.mak @@ -93,7 +93,7 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += src\lbson.cpp +SOURCES += src/lbson.cpp CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/lcodec/lcodec.mak b/extend/lcodec/lcodec.mak index d48bfc85..8a7989e7 100644 --- a/extend/lcodec/lcodec.mak +++ b/extend/lcodec/lcodec.mak @@ -93,7 +93,7 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += src\lcodec.cpp +SOURCES += src/lcodec.cpp CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/ldetour/ldetour.mak b/extend/ldetour/ldetour.mak index 593d7413..5b7cdfbf 100644 --- a/extend/ldetour/ldetour.mak +++ b/extend/ldetour/ldetour.mak @@ -94,15 +94,15 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += src\detour.cpp -SOURCES += src\detour\DetourAlloc.cpp -SOURCES += src\detour\DetourAssert.cpp -SOURCES += src\detour\DetourCommon.cpp -SOURCES += src\detour\DetourNavMesh.cpp -SOURCES += src\detour\DetourNavMeshBuilder.cpp -SOURCES += src\detour\DetourNavMeshQuery.cpp -SOURCES += src\detour\DetourNode.cpp -SOURCES += src\ldetor.cpp +SOURCES += src/detour.cpp +SOURCES += src/detour/DetourAlloc.cpp +SOURCES += src/detour/DetourAssert.cpp +SOURCES += src/detour/DetourCommon.cpp +SOURCES += src/detour/DetourNavMesh.cpp +SOURCES += src/detour/DetourNavMeshBuilder.cpp +SOURCES += src/detour/DetourNavMeshQuery.cpp +SOURCES += src/detour/DetourNode.cpp +SOURCES += src/ldetor.cpp CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/ljson/ljson.mak b/extend/ljson/ljson.mak index 2d46db05..6866a032 100644 --- a/extend/ljson/ljson.mak +++ b/extend/ljson/ljson.mak @@ -91,8 +91,8 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += src\ljson.cpp -SOURCES += src\yyjson.c +SOURCES += src/ljson.cpp +SOURCES += src/yyjson.c CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/lmake/tmpl/make.tpl b/extend/lmake/tmpl/make.tpl index a69141a7..79cdb0d1 100644 --- a/extend/lmake/tmpl/make.tpl +++ b/extend/lmake/tmpl/make.tpl @@ -220,7 +220,8 @@ SOURCES = {{% local ARGS = {RECURSION = RECURSION, OBJS = OBJS, EXCLUDE_FILE = EXCLUDE_FILE } %}} {{% local _, CSOURCES = COLLECT_SOURCES(WORK_DIR, SRC_DIRS, ARGS) %}} {{% for _, CSRC in ipairs(CSOURCES) do %}} -SOURCES += {{%= CSRC[1] %}} +{{% local fmtsrc = string.gsub(CSRC[1], '\\', '/') %}} +SOURCES += {{%= fmtsrc %}} {{% TEMPS[CSRC[2]] = true %}} {{% end %}} {{% for CSRC in pairs(TEMPS) do %}} diff --git a/extend/lmdb/lmdb.mak b/extend/lmdb/lmdb.mak index 07940a57..87a797df 100644 --- a/extend/lmdb/lmdb.mak +++ b/extend/lmdb/lmdb.mak @@ -91,9 +91,9 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += src\llmdb.cpp -SOURCES += src\mdb.c -SOURCES += src\midl.c +SOURCES += src/llmdb.cpp +SOURCES += src/mdb.c +SOURCES += src/midl.c CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/lminiz/lminiz.mak b/extend/lminiz/lminiz.mak index 8111b4ac..eb770148 100644 --- a/extend/lminiz/lminiz.mak +++ b/extend/lminiz/lminiz.mak @@ -100,8 +100,8 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += src\lminiz.cpp -SOURCES += src\miniz.c +SOURCES += src/lminiz.cpp +SOURCES += src/miniz.c CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/lsqlite/lsqlite.mak b/extend/lsqlite/lsqlite.mak index 41736cb3..9d0ee6d8 100644 --- a/extend/lsqlite/lsqlite.mak +++ b/extend/lsqlite/lsqlite.mak @@ -97,9 +97,9 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += src\lsqlite.cpp -SOURCES += src\os_ps.c -SOURCES += src\sqlite3.c +SOURCES += src/lsqlite.cpp +SOURCES += src/os_ps.c +SOURCES += src/sqlite3.c CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/lssl/lssl.mak b/extend/lssl/lssl.mak index 8ed44879..e2c31325 100644 --- a/extend/lssl/lssl.mak +++ b/extend/lssl/lssl.mak @@ -107,118 +107,118 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += src\src\crl.c -SOURCES += src\src\dtls.c -SOURCES += src\src\dtls13.c -SOURCES += src\src\internal.c -SOURCES += src\src\keys.c -SOURCES += src\src\ocsp.c -SOURCES += src\src\quic.c -SOURCES += src\src\sniffer.c -SOURCES += src\src\ssl.c -SOURCES += src\src\tls.c -SOURCES += src\src\tls13.c -SOURCES += src\src\wolfio.c -SOURCES += src\ssl\crc.c -SOURCES += src\ssl\hmac_sha.c -SOURCES += src\ssl\lssl.cpp -SOURCES += src\ssl\lz4.c -SOURCES += src\ssl\xxtea.c -SOURCES += src\wolfcrypt\src\aes.c -SOURCES += src\wolfcrypt\src\arc4.c -SOURCES += src\wolfcrypt\src\asm.c -SOURCES += src\wolfcrypt\src\asn.c -SOURCES += src\wolfcrypt\src\blake2b.c -SOURCES += src\wolfcrypt\src\blake2s.c -SOURCES += src\wolfcrypt\src\camellia.c -SOURCES += src\wolfcrypt\src\chacha.c -SOURCES += src\wolfcrypt\src\chacha20_poly1305.c -SOURCES += src\wolfcrypt\src\cmac.c -SOURCES += src\wolfcrypt\src\coding.c -SOURCES += src\wolfcrypt\src\compress.c -SOURCES += src\wolfcrypt\src\cpuid.c -SOURCES += src\wolfcrypt\src\cryptocb.c -SOURCES += src\wolfcrypt\src\curve25519.c -SOURCES += src\wolfcrypt\src\curve448.c -SOURCES += src\wolfcrypt\src\des3.c -SOURCES += src\wolfcrypt\src\dh.c -SOURCES += src\wolfcrypt\src\dilithium.c -SOURCES += src\wolfcrypt\src\dsa.c -SOURCES += src\wolfcrypt\src\ecc.c -SOURCES += src\wolfcrypt\src\ecc_fp.c -SOURCES += src\wolfcrypt\src\eccsi.c -SOURCES += src\wolfcrypt\src\ed25519.c -SOURCES += src\wolfcrypt\src\ed448.c -SOURCES += src\wolfcrypt\src\error.c -SOURCES += src\wolfcrypt\src\ext_kyber.c -SOURCES += src\wolfcrypt\src\ext_lms.c -SOURCES += src\wolfcrypt\src\ext_xmss.c -SOURCES += src\wolfcrypt\src\falcon.c -SOURCES += src\wolfcrypt\src\fe_448.c -SOURCES += src\wolfcrypt\src\fe_low_mem.c -SOURCES += src\wolfcrypt\src\fe_operations.c -SOURCES += src\wolfcrypt\src\ge_448.c -SOURCES += src\wolfcrypt\src\ge_low_mem.c -SOURCES += src\wolfcrypt\src\ge_operations.c -SOURCES += src\wolfcrypt\src\hash.c -SOURCES += src\wolfcrypt\src\hmac.c -SOURCES += src\wolfcrypt\src\hpke.c -SOURCES += src\wolfcrypt\src\integer.c -SOURCES += src\wolfcrypt\src\kdf.c -SOURCES += src\wolfcrypt\src\logging.c -SOURCES += src\wolfcrypt\src\md2.c -SOURCES += src\wolfcrypt\src\md4.c -SOURCES += src\wolfcrypt\src\md5.c -SOURCES += src\wolfcrypt\src\memory.c -SOURCES += src\wolfcrypt\src\pkcs12.c -SOURCES += src\wolfcrypt\src\pkcs7.c -SOURCES += src\wolfcrypt\src\poly1305.c -SOURCES += src\wolfcrypt\src\pwdbased.c -SOURCES += src\wolfcrypt\src\random.c -SOURCES += src\wolfcrypt\src\rc2.c -SOURCES += src\wolfcrypt\src\ripemd.c -SOURCES += src\wolfcrypt\src\rsa.c -SOURCES += src\wolfcrypt\src\sakke.c -SOURCES += src\wolfcrypt\src\sha.c -SOURCES += src\wolfcrypt\src\sha256.c -SOURCES += src\wolfcrypt\src\sha3.c -SOURCES += src\wolfcrypt\src\sha512.c -SOURCES += src\wolfcrypt\src\signature.c -SOURCES += src\wolfcrypt\src\siphash.c -SOURCES += src\wolfcrypt\src\sm2.c -SOURCES += src\wolfcrypt\src\sm3.c -SOURCES += src\wolfcrypt\src\sm4.c -SOURCES += src\wolfcrypt\src\sp_arm32.c -SOURCES += src\wolfcrypt\src\sp_arm64.c -SOURCES += src\wolfcrypt\src\sp_armthumb.c -SOURCES += src\wolfcrypt\src\sp_c32.c -SOURCES += src\wolfcrypt\src\sp_c64.c -SOURCES += src\wolfcrypt\src\sp_cortexm.c -SOURCES += src\wolfcrypt\src\sp_dsp32.c -SOURCES += src\wolfcrypt\src\sp_int.c -SOURCES += src\wolfcrypt\src\sp_sm2_arm32.c -SOURCES += src\wolfcrypt\src\sp_sm2_arm64.c -SOURCES += src\wolfcrypt\src\sp_sm2_armthumb.c -SOURCES += src\wolfcrypt\src\sp_sm2_c32.c -SOURCES += src\wolfcrypt\src\sp_sm2_c64.c -SOURCES += src\wolfcrypt\src\sp_sm2_cortexm.c -SOURCES += src\wolfcrypt\src\sp_sm2_x86_64.c -SOURCES += src\wolfcrypt\src\sp_x86_64.c -SOURCES += src\wolfcrypt\src\sphincs.c -SOURCES += src\wolfcrypt\src\srp.c -SOURCES += src\wolfcrypt\src\tfm.c -SOURCES += src\wolfcrypt\src\wc_dsp.c -SOURCES += src\wolfcrypt\src\wc_encrypt.c -SOURCES += src\wolfcrypt\src\wc_kyber.c -SOURCES += src\wolfcrypt\src\wc_kyber_poly.c -SOURCES += src\wolfcrypt\src\wc_lms.c -SOURCES += src\wolfcrypt\src\wc_lms_impl.c -SOURCES += src\wolfcrypt\src\wc_pkcs11.c -SOURCES += src\wolfcrypt\src\wc_port.c -SOURCES += src\wolfcrypt\src\wc_xmss.c -SOURCES += src\wolfcrypt\src\wc_xmss_impl.c -SOURCES += src\wolfcrypt\src\wolfevent.c -SOURCES += src\wolfcrypt\src\wolfmath.c +SOURCES += src/src/crl.c +SOURCES += src/src/dtls.c +SOURCES += src/src/dtls13.c +SOURCES += src/src/internal.c +SOURCES += src/src/keys.c +SOURCES += src/src/ocsp.c +SOURCES += src/src/quic.c +SOURCES += src/src/sniffer.c +SOURCES += src/src/ssl.c +SOURCES += src/src/tls.c +SOURCES += src/src/tls13.c +SOURCES += src/src/wolfio.c +SOURCES += src/ssl/crc.c +SOURCES += src/ssl/hmac_sha.c +SOURCES += src/ssl/lssl.cpp +SOURCES += src/ssl/lz4.c +SOURCES += src/ssl/xxtea.c +SOURCES += src/wolfcrypt/src/aes.c +SOURCES += src/wolfcrypt/src/arc4.c +SOURCES += src/wolfcrypt/src/asm.c +SOURCES += src/wolfcrypt/src/asn.c +SOURCES += src/wolfcrypt/src/blake2b.c +SOURCES += src/wolfcrypt/src/blake2s.c +SOURCES += src/wolfcrypt/src/camellia.c +SOURCES += src/wolfcrypt/src/chacha.c +SOURCES += src/wolfcrypt/src/chacha20_poly1305.c +SOURCES += src/wolfcrypt/src/cmac.c +SOURCES += src/wolfcrypt/src/coding.c +SOURCES += src/wolfcrypt/src/compress.c +SOURCES += src/wolfcrypt/src/cpuid.c +SOURCES += src/wolfcrypt/src/cryptocb.c +SOURCES += src/wolfcrypt/src/curve25519.c +SOURCES += src/wolfcrypt/src/curve448.c +SOURCES += src/wolfcrypt/src/des3.c +SOURCES += src/wolfcrypt/src/dh.c +SOURCES += src/wolfcrypt/src/dilithium.c +SOURCES += src/wolfcrypt/src/dsa.c +SOURCES += src/wolfcrypt/src/ecc.c +SOURCES += src/wolfcrypt/src/ecc_fp.c +SOURCES += src/wolfcrypt/src/eccsi.c +SOURCES += src/wolfcrypt/src/ed25519.c +SOURCES += src/wolfcrypt/src/ed448.c +SOURCES += src/wolfcrypt/src/error.c +SOURCES += src/wolfcrypt/src/ext_kyber.c +SOURCES += src/wolfcrypt/src/ext_lms.c +SOURCES += src/wolfcrypt/src/ext_xmss.c +SOURCES += src/wolfcrypt/src/falcon.c +SOURCES += src/wolfcrypt/src/fe_448.c +SOURCES += src/wolfcrypt/src/fe_low_mem.c +SOURCES += src/wolfcrypt/src/fe_operations.c +SOURCES += src/wolfcrypt/src/ge_448.c +SOURCES += src/wolfcrypt/src/ge_low_mem.c +SOURCES += src/wolfcrypt/src/ge_operations.c +SOURCES += src/wolfcrypt/src/hash.c +SOURCES += src/wolfcrypt/src/hmac.c +SOURCES += src/wolfcrypt/src/hpke.c +SOURCES += src/wolfcrypt/src/integer.c +SOURCES += src/wolfcrypt/src/kdf.c +SOURCES += src/wolfcrypt/src/logging.c +SOURCES += src/wolfcrypt/src/md2.c +SOURCES += src/wolfcrypt/src/md4.c +SOURCES += src/wolfcrypt/src/md5.c +SOURCES += src/wolfcrypt/src/memory.c +SOURCES += src/wolfcrypt/src/pkcs12.c +SOURCES += src/wolfcrypt/src/pkcs7.c +SOURCES += src/wolfcrypt/src/poly1305.c +SOURCES += src/wolfcrypt/src/pwdbased.c +SOURCES += src/wolfcrypt/src/random.c +SOURCES += src/wolfcrypt/src/rc2.c +SOURCES += src/wolfcrypt/src/ripemd.c +SOURCES += src/wolfcrypt/src/rsa.c +SOURCES += src/wolfcrypt/src/sakke.c +SOURCES += src/wolfcrypt/src/sha.c +SOURCES += src/wolfcrypt/src/sha256.c +SOURCES += src/wolfcrypt/src/sha3.c +SOURCES += src/wolfcrypt/src/sha512.c +SOURCES += src/wolfcrypt/src/signature.c +SOURCES += src/wolfcrypt/src/siphash.c +SOURCES += src/wolfcrypt/src/sm2.c +SOURCES += src/wolfcrypt/src/sm3.c +SOURCES += src/wolfcrypt/src/sm4.c +SOURCES += src/wolfcrypt/src/sp_arm32.c +SOURCES += src/wolfcrypt/src/sp_arm64.c +SOURCES += src/wolfcrypt/src/sp_armthumb.c +SOURCES += src/wolfcrypt/src/sp_c32.c +SOURCES += src/wolfcrypt/src/sp_c64.c +SOURCES += src/wolfcrypt/src/sp_cortexm.c +SOURCES += src/wolfcrypt/src/sp_dsp32.c +SOURCES += src/wolfcrypt/src/sp_int.c +SOURCES += src/wolfcrypt/src/sp_sm2_arm32.c +SOURCES += src/wolfcrypt/src/sp_sm2_arm64.c +SOURCES += src/wolfcrypt/src/sp_sm2_armthumb.c +SOURCES += src/wolfcrypt/src/sp_sm2_c32.c +SOURCES += src/wolfcrypt/src/sp_sm2_c64.c +SOURCES += src/wolfcrypt/src/sp_sm2_cortexm.c +SOURCES += src/wolfcrypt/src/sp_sm2_x86_64.c +SOURCES += src/wolfcrypt/src/sp_x86_64.c +SOURCES += src/wolfcrypt/src/sphincs.c +SOURCES += src/wolfcrypt/src/srp.c +SOURCES += src/wolfcrypt/src/tfm.c +SOURCES += src/wolfcrypt/src/wc_dsp.c +SOURCES += src/wolfcrypt/src/wc_encrypt.c +SOURCES += src/wolfcrypt/src/wc_kyber.c +SOURCES += src/wolfcrypt/src/wc_kyber_poly.c +SOURCES += src/wolfcrypt/src/wc_lms.c +SOURCES += src/wolfcrypt/src/wc_lms_impl.c +SOURCES += src/wolfcrypt/src/wc_pkcs11.c +SOURCES += src/wolfcrypt/src/wc_port.c +SOURCES += src/wolfcrypt/src/wc_xmss.c +SOURCES += src/wolfcrypt/src/wc_xmss_impl.c +SOURCES += src/wolfcrypt/src/wolfevent.c +SOURCES += src/wolfcrypt/src/wolfmath.c CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/lstdfs/lstdfs.mak b/extend/lstdfs/lstdfs.mak index e07e317f..f1b7e426 100644 --- a/extend/lstdfs/lstdfs.mak +++ b/extend/lstdfs/lstdfs.mak @@ -96,7 +96,7 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += src\lstdfs.cpp +SOURCES += src/lstdfs.cpp CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/ltimer/ltimer.mak b/extend/ltimer/ltimer.mak index 93406e20..a5bf8247 100644 --- a/extend/ltimer/ltimer.mak +++ b/extend/ltimer/ltimer.mak @@ -93,7 +93,7 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += src\ltimer.cpp +SOURCES += src/ltimer.cpp CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/lua/lua.mak b/extend/lua/lua.mak index 69563ab2..1b450bab 100644 --- a/extend/lua/lua.mak +++ b/extend/lua/lua.mak @@ -84,7 +84,7 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += lua\onelua.c +SOURCES += lua/onelua.c CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/lua/luac.mak b/extend/lua/luac.mak index f6014aaa..7e6f88ca 100644 --- a/extend/lua/luac.mak +++ b/extend/lua/luac.mak @@ -85,7 +85,7 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += lua\onelua.c +SOURCES += lua/onelua.c CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/lua/lualib.mak b/extend/lua/lualib.mak index ea08df01..f2897578 100644 --- a/extend/lua/lualib.mak +++ b/extend/lua/lualib.mak @@ -97,7 +97,7 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += lua\onelua.c +SOURCES += lua/onelua.c CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/luakit/include/lua_base.h b/extend/luakit/include/lua_base.h index e874d56e..53b54858 100644 --- a/extend/luakit/include/lua_base.h +++ b/extend/luakit/include/lua_base.h @@ -59,16 +59,17 @@ namespace luakit { index = lua_absindex(L, index); lua_guard g(L); lua_pushnil(L); + size_t curlen = 0; while (lua_next(L, index) != 0) { if (!lua_isinteger(L, -2)) return false; size_t key = lua_tointeger(L, -2); if (key <= 0 || key > raw_len) return false; lua_pop(L, 1); + curlen++; } - return true; + return curlen == raw_len; } - class lua_exception : public std::logic_error { public: template diff --git a/extend/lualog/lualog.mak b/extend/lualog/lualog.mak index 85f251f0..34509c62 100644 --- a/extend/lualog/lualog.mak +++ b/extend/lualog/lualog.mak @@ -98,8 +98,8 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += lualog\logger.cpp -SOURCES += lualog\lualog.cpp +SOURCES += lualog/logger.cpp +SOURCES += lualog/lualog.cpp CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/luapb/luapb.mak b/extend/luapb/luapb.mak index 0ea5da96..3d7e5e0b 100644 --- a/extend/luapb/luapb.mak +++ b/extend/luapb/luapb.mak @@ -93,7 +93,7 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += src\luapb.cpp +SOURCES += src/luapb.cpp CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/luaxlsx/luaxlsx.mak b/extend/luaxlsx/luaxlsx.mak index e441319b..9e0f1fe8 100644 --- a/extend/luaxlsx/luaxlsx.mak +++ b/extend/luaxlsx/luaxlsx.mak @@ -102,9 +102,9 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += ..\lminiz\src\miniz.c -SOURCES += ..\luaxml\src\tinyxml2.cpp -SOURCES += src\luaxlsx.cpp +SOURCES += ../lminiz/src/miniz.c +SOURCES += ../luaxml/src/tinyxml2.cpp +SOURCES += src/luaxlsx.cpp CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/luaxml/luaxml.mak b/extend/luaxml/luaxml.mak index 87ffea67..fc40a037 100644 --- a/extend/luaxml/luaxml.mak +++ b/extend/luaxml/luaxml.mak @@ -93,8 +93,8 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += src\luaxml.cpp -SOURCES += src\tinyxml2.cpp +SOURCES += src/luaxml.cpp +SOURCES += src/tinyxml2.cpp CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/lunqlite/lunqlite.mak b/extend/lunqlite/lunqlite.mak index 849f8e75..9475210c 100644 --- a/extend/lunqlite/lunqlite.mak +++ b/extend/lunqlite/lunqlite.mak @@ -94,8 +94,8 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += src\lunqlite.cpp -SOURCES += src\unqlite.c +SOURCES += src/lunqlite.cpp +SOURCES += src/unqlite.c CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/lworker/lworker.mak b/extend/lworker/lworker.mak index 109e78ab..d293785d 100644 --- a/extend/lworker/lworker.mak +++ b/extend/lworker/lworker.mak @@ -96,7 +96,7 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += src\lworker.cpp +SOURCES += src/lworker.cpp CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES)) diff --git a/extend/mimalloc/mimalloc.mak b/extend/mimalloc/mimalloc.mak index 52370135..4e0efcf9 100644 --- a/extend/mimalloc/mimalloc.mak +++ b/extend/mimalloc/mimalloc.mak @@ -92,22 +92,22 @@ LDFLAGS += -L$(SOLUTION_DIR)library #自动生成目标 SOURCES = -SOURCES += mimalloc\src\alloc-aligned.c -SOURCES += mimalloc\src\alloc-posix.c -SOURCES += mimalloc\src\alloc.c -SOURCES += mimalloc\src\arena.c -SOURCES += mimalloc\src\bitmap.c -SOURCES += mimalloc\src\heap.c -SOURCES += mimalloc\src\init.c -SOURCES += mimalloc\src\libc.c -SOURCES += mimalloc\src\options.c -SOURCES += mimalloc\src\os.c -SOURCES += mimalloc\src\page.c -SOURCES += mimalloc\src\prim\prim.c -SOURCES += mimalloc\src\random.c -SOURCES += mimalloc\src\segment-map.c -SOURCES += mimalloc\src\segment.c -SOURCES += mimalloc\src\stats.c +SOURCES += mimalloc/src/alloc-aligned.c +SOURCES += mimalloc/src/alloc-posix.c +SOURCES += mimalloc/src/alloc.c +SOURCES += mimalloc/src/arena.c +SOURCES += mimalloc/src/bitmap.c +SOURCES += mimalloc/src/heap.c +SOURCES += mimalloc/src/init.c +SOURCES += mimalloc/src/libc.c +SOURCES += mimalloc/src/options.c +SOURCES += mimalloc/src/os.c +SOURCES += mimalloc/src/page.c +SOURCES += mimalloc/src/prim/prim.c +SOURCES += mimalloc/src/random.c +SOURCES += mimalloc/src/segment-map.c +SOURCES += mimalloc/src/segment.c +SOURCES += mimalloc/src/stats.c CSOURCES = $(patsubst %.c, $(INT_DIR)/%.o, $(SOURCES)) MSOURCES = $(patsubst %.m, $(INT_DIR)/%.o, $(CSOURCES))