From f34e5ae6f547bc8521cc3c3020564ca7367af049 Mon Sep 17 00:00:00 2001 From: Fierelier Date: Mon, 4 Mar 2024 02:47:07 +0100 Subject: [PATCH] Fix Windows' TCC path of compilation --- lua-5.3/compile.c | 13 ++++++++++--- tinycc-d2f8ceac/compile.c | 5 +++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/lua-5.3/compile.c b/lua-5.3/compile.c index fbfc716..a7dffa1 100644 --- a/lua-5.3/compile.c +++ b/lua-5.3/compile.c @@ -3,6 +3,11 @@ #define ENV_CC "tcc" #endif +/* +#define ENV_SPATH "C:\\tinycc" +#define ENV_CC ENV_SPATH"\\tcc.exe","-I"ENV_SPATH"\\win32\\include","-I"ENV_SPATH"\\win32\\include\\sec_api","-I"ENV_SPATH"\\win32\\include\\sys","-I"ENV_SPATH"\\win32\\include\\tcc","-I"ENV_SPATH"\\win32\\include\\winapi","-I"ENV_SPATH"\\include","-I"ENV_SPATH,"-L"ENV_SPATH"\\win32\\lib","-L"ENV_SPATH"\\lib","-L"ENV_SPATH +*/ + #ifndef ENV_CFLAGS #define ENV_CFLAGS "-D__MTC_NONE" #endif @@ -249,7 +254,8 @@ int main (int argc, const char * argv[]) { call_proc_error(ENV_CC,"-O2","-Wall","-Wextra","-DLUA_COMPAT_5_2","-DLUA_BUILD_AS_DLL",ENV_CFLAGS,"-c","-o","loadlib.o","loadlib.c",NULL); call_proc_error(ENV_CC,"-O2","-Wall","-Wextra","-DLUA_COMPAT_5_2","-DLUA_BUILD_AS_DLL",ENV_CFLAGS,"-c","-o","linit.o","linit.c",NULL); call_proc_error(ENV_CC,ENV_CFLAGS,"-shared","-o","lua53.dll","lapi.o","lcode.o","lctype.o","ldebug.o","ldo.o","ldump.o","lfunc.o","lgc.o","llex.o","lmem.o","lobject.o","lopcodes.o","lparser.o","lstate.o","lstring.o","ltable.o","ltm.o","lundump.o","lvm.o","lzio.o","lauxlib.o","lbaselib.o","lbitlib.o","lcorolib.o","ldblib.o","liolib.o","lmathlib.o","loslib.o","lstrlib.o","ltablib.o","lutf8lib.o","loadlib.o","linit.o",NULL); - call_proc_error(ENV_CC,ENV_CFLAGS,"-o","lua.exe","-s","lua.o","lua53.dll","-lm",NULL); + //call_proc_error(ENV_CC,ENV_CFLAGS,"-o","lua.exe","-s","lua.o","lua53.dll","-lm",NULL); + call_proc_error(ENV_CC,ENV_CFLAGS,"-o","lua.exe","-s","lua.o","lua53.dll",NULL); call_proc_error(ENV_CC,"-O2","-Wall","-Wextra","-DLUA_COMPAT_5_2",ENV_CFLAGS,"-c","-o","luac.o","luac.c",NULL); call_proc_error(ENV_CC,"-O2","-Wall","-Wextra","-DLUA_COMPAT_5_2",ENV_CFLAGS,"-c","-o","lapi.o","lapi.c",NULL); call_proc_error(ENV_CC,"-O2","-Wall","-Wextra","-DLUA_COMPAT_5_2",ENV_CFLAGS,"-c","-o","lcode.o","lcode.c",NULL); @@ -284,8 +290,9 @@ int main (int argc, const char * argv[]) { call_proc_error(ENV_CC,"-O2","-Wall","-Wextra","-DLUA_COMPAT_5_2",ENV_CFLAGS,"-c","-o","lutf8lib.o","lutf8lib.c",NULL); call_proc_error(ENV_CC,"-O2","-Wall","-Wextra","-DLUA_COMPAT_5_2",ENV_CFLAGS,"-c","-o","loadlib.o","loadlib.c",NULL); call_proc_error(ENV_CC,"-O2","-Wall","-Wextra","-DLUA_COMPAT_5_2",ENV_CFLAGS,"-c","-o","linit.o","linit.c",NULL); - call_proc_error(ENV_CC,ENV_CFLAGS,"-shared","-o","liblua.a","lapi.o","lcode.o","lctype.o","ldebug.o","ldo.o","ldump.o","lfunc.o","lgc.o","llex.o","lmem.o","lobject.o","lopcodes.o","lparser.o","lstate.o","lstring.o","ltable.o","ltm.o","lundump.o","lvm.o","lzio.o","lauxlib.o","lbaselib.o","lbitlib.o","lcorolib.o","ldblib.o","liolib.o","lmathlib.o","loslib.o","lstrlib.o","ltablib.o","lutf8lib.o","loadlib.o","linit.o",NULL); - call_proc_error(ENV_CC,ENV_CFLAGS,"-o","luac.exe","luac.o","liblua.a","-lm",NULL); + //call_proc_error(ENV_CC,ENV_CFLAGS,"-shared","-o","liblua.a","lapi.o","lcode.o","lctype.o","ldebug.o","ldo.o","ldump.o","lfunc.o","lgc.o","llex.o","lmem.o","lobject.o","lopcodes.o","lparser.o","lstate.o","lstring.o","ltable.o","ltm.o","lundump.o","lvm.o","lzio.o","lauxlib.o","lbaselib.o","lbitlib.o","lcorolib.o","ldblib.o","liolib.o","lmathlib.o","loslib.o","lstrlib.o","ltablib.o","lutf8lib.o","loadlib.o","linit.o",NULL); + ////call_proc_error(ENV_CC,ENV_CFLAGS,"-o","luac.exe","luac.o","liblua.a","-lm",NULL); + //call_proc_error(ENV_CC,ENV_CFLAGS,"-o","luac.exe","luac.o","liblua.a",NULL); #endif return 0; diff --git a/tinycc-d2f8ceac/compile.c b/tinycc-d2f8ceac/compile.c index ca7d53e..b2e1d86 100644 --- a/tinycc-d2f8ceac/compile.c +++ b/tinycc-d2f8ceac/compile.c @@ -3,6 +3,11 @@ #define ENV_CC "tcc" #endif +/* +#define ENV_SPATH "C:\\tinycc" +#define ENV_CC ENV_SPATH"\\tcc.exe","-I"ENV_SPATH"\\win32\\include","-I"ENV_SPATH"\\win32\\include\\sec_api","-I"ENV_SPATH"\\win32\\include\\sys","-I"ENV_SPATH"\\win32\\include\\tcc","-I"ENV_SPATH"\\win32\\include\\winapi","-I"ENV_SPATH"\\include","-I"ENV_SPATH,"-L"ENV_SPATH"\\win32\\lib","-L"ENV_SPATH"\\lib","-L"ENV_SPATH +*/ + #ifndef ENV_CFLAGS #define ENV_CFLAGS "-D__MTC_NONE" #endif