fix: add win32ports headers

also remove overlapping tinycc/mingw32 headers shipped in tinycc/win32
dyne · Dec 17, 2024 · 9bcfe6f · 9bcfe6f
1 parent 63c741f
commit 9bcfe6f
Show file tree

Hide file tree

Showing 10 changed files with 1,708 additions and 220 deletions.
diff --git a/build/win-native.mk b/build/win-native.mk
@@ -24,7 +24,8 @@ SOURCES += src/win-compat.o  \
 	src/embed_libtcc1.a.o     \
 	src/embed_include.o \
 	src/embed_contrib_headers.o \
-	src/embed_tinycc_win32.o
+	src/embed_tinycc_win32.o \
+	src/embed_win32ports.o
 
 all: embed cjit.exe
 
@@ -35,6 +36,7 @@ embed: lib/tinycc/libtcc1.a
 	bash build/embed-path.sh lib/tinycc/include
 	bash build/embed-path.sh lib/tinycc/win32/include tinycc_win32
 	bash build/embed-path.sh lib/contrib_headers
+	bash build/embed-path.sh lib/win32ports
 	@echo                 >> src/embedded.c
 	@echo "return(true);" >> src/embedded.c
 	@echo "}"             >> src/embedded.c

diff --git a/build/win-wsl.mk b/build/win-wsl.mk
@@ -7,6 +7,8 @@ include build/init.mk
 
 cc := x86_64-w64-mingw32-gcc
 ar := x86_64-w64-mingw32-ar
+
+cflags := -Og -ggdb ${cflags_includes}
 cflags += -DCJIT_BUILD_WIN
 
 ldadd += -lrpcrt4 -lshlwapi
@@ -20,7 +22,8 @@ SOURCES += src/win-compat.o  \
 	src/embed_libtcc1.a.o     \
 	src/embed_include.o \
 	src/embed_contrib_headers.o \
-	src/embed_tinycc_win32.o
+	src/embed_tinycc_win32.o \
+	src/embed_win32ports.o
 
 all: deps embed cjit.exe
 
@@ -31,6 +34,7 @@ embed: lib/tinycc/libtcc1.a
 	bash build/embed-path.sh lib/tinycc/include
 	bash build/embed-path.sh lib/tinycc/win32/include tinycc_win32
 	bash build/embed-path.sh lib/contrib_headers
+	bash build/embed-path.sh lib/win32ports
 	@echo "\nreturn(true);\n}\n" >> src/embedded.c
 	@echo "\n#endif\n" >> src/embedded.h
 

diff --git a/lib/tinycc/win32/include/dirent.h b/lib/tinycc/win32/include/dirent.h
diff --git a/lib/tinycc/win32/include/sys/time.h b/lib/tinycc/win32/include/sys/time.h
diff --git a/lib/tinycc/win32/include/sys/unistd.h b/lib/tinycc/win32/include/sys/unistd.h