X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2FMakefile;h=b4b7c11d4d61a8db50e290237c23ed7284c53135;hb=f194730e75d6d3681e5f99a4efed1616fd1ea738;hp=fddfbcca2e56ceb81c111e351268bac11c467f2a;hpb=d047958aaade97d65ed5d5ca6c3835c2699e1010;p=tpg%2Facess2.git

diff --git a/AcessNative/acesskernel_src/Makefile b/AcessNative/acesskernel_src/Makefile
index fddfbcca..b4b7c11d 100644
--- a/AcessNative/acesskernel_src/Makefile
+++ b/AcessNative/acesskernel_src/Makefile
@@ -25,7 +25,7 @@ N_OBJ := main.o
 BUILDINFO_OBJ := obj-$(PLATFORM)/buildinfo.o
 BUILDINFO_SRC := $(BUILDINFO_OBJ:%.o=%.c)
 
-OBJ := helpers.o threads.o server.o syscalls.o time.o
+OBJ := helpers.o threads.o threads_glue.o server.o syscalls.o time.o
 OBJ += video.o keyboard.o mouse.o nativefs.o vfs_handle.o ui_sdl.o
 OBJ := $(addprefix obj-$(PLATFORM)/,$(OBJ))
 N_OBJ := $(addprefix obj-$(PLATFORM)/,$(N_OBJ))
@@ -34,16 +34,18 @@ K_OBJ := $(addprefix $(KERNEL_SRC)obj-native-$(PLATFORM)/,$(KERNEL_OBJ))
 DEPFILES  = $(filter %.o,$(OBJ) $(N_OBJ) $(K_OBJ))
 DEPFILES := $(DEPFILES:%=%.dep)
 
-CPPFLAGS += -I include/ -I $(KERNEL_SRC)include/
+KCPPFLAGS = -I include/ -I $(KERNEL_SRC)include/
 CFLAGS += -Wall -g -std=gnu99
 LDFLAGS += -lSDL -lSDLmain -g -Wl,--defsym,__buildnum=$(BUILD_NUM)
 
 ifeq ($(PLATFORM),win)
 	BIN := ../AcessKernel.exe
+	LDFLAGS += -lws2_32 -lpthread
 endif
 ifeq ($(PLATFORM),lin)
 	BIN := ../AcessKernel
-	CFLAGS +=
+	CFLAGS += 
+	LDFLAGS += -lpthread
 endif
 
 .PHONY: all clean
@@ -61,26 +63,26 @@ $(BIN): $(OBJ) $(N_OBJ) $(K_OBJ) $(BUILDINFO_OBJ)
 $(OBJ): obj-$(PLATFORM)/%.o: %.c
 	@mkdir -p $(dir $@)
 	@echo [CC] -o $@
-	@$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
-	@$(CC) -M $(CPPFLAGS) -MT $@ -o $@.dep $<
+	@$(CC) -c $< -o $@ $(CFLAGS) $(KCPPFLAGS) $(CPPFLAGS)
+	@$(CC) -M $(CPPFLAGS) $(KCPPFLAGS) -MT $@ -o $@.dep $<
 
 $(K_OBJ): $(KERNEL_SRC)obj-native-$(PLATFORM)/%.o: $(KERNEL_SRC)%.c
 	@mkdir -p $(dir $@)
 	@echo [CC] -o $@
-	@$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
-	@$(CC) -M $(CPPFLAGS) -MT $@ -o $@.dep $<
+	$(CC) -ffreestanding -c $< -o $@ $(CFLAGS) $(KCPPFLAGS) $(CPPFLAGS)
+	@$(CC) -ffreestanding -M $(KCPPFLAGS) $(CPPFLAGS) -MT $@ -o $@.dep $<
 
 
 $(N_OBJ): obj-$(PLATFORM)/%.o: %.c
 	@mkdir -p $(dir $@)
 	@echo [CC] -o $@
-	@$(CC) -c $< -o $@ $(CFLAGS)
+	@$(CC) -c $< -o $@ $(CPPFLAGS) $(CFLAGS)
 	@$(CC) -M -MT $@ -o $@.dep $<
 
 $(BUILDINFO_SRC): $(filter-out $(BUILDINFO_OBJ), $(OBJ)) Makefile
 	@echo "" > $@
-	$(eval _GITHASH=$(shell git log -n 1 | head -n 1 | awk '{print $$2}'))
-	$(eval _GITCHANGED=$(shell git status --porcelain | grep -c '^ M '))
+	$(eval _GITHASH=$(shell (git log -n 1 | head -n 1 | awk '{print $$2}') || echo UNK))
+	$(eval _GITCHANGED=$(shell (git status --porcelain | grep -c '^ M ') || echo UNK))
 	@echo "const char gsKernelVersion[] = \"$(ACESS_VERSION)\";" >> $@
 	@echo "const char gsGitHash[] = \"$(_GITHASH)\";" >> $@
 	@echo "const char gsBuildInfo[] = \"Acess2 v$(KERNEL_VERSION) $(ARCH)-$(PLATFORM)\\\\r\\\\n\"" >> $@