修复编译错误

xiyoo0812 · May 8, 2024 · 9848eaf · 9848eaf
1 parent f38514c
commit 9848eaf
Show file tree

Hide file tree

Showing 25 changed files with 184 additions and 182 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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))