AcessNative - Fixed missing header (typo)

diff --git a/AcessNative/acesskernel_src/Makefile b/AcessNative/acesskernel_src/Makefile
index 611509b..be21e45 100644 (file)
--- a/AcessNative/acesskernel_src/Makefile
+++ b/AcessNative/acesskernel_src/Makefile
@@ -34,7 +34,7 @@ K_OBJ := $(addprefix $(KERNEL_SRC)obj-native-$(PLATFORM)/,$(KERNEL_OBJ))
 DEPFILES  = $(filter %.o,$(OBJ) $(N_OBJ) $(K_OBJ))\r
 DEPFILES := $(DEPFILES:%=%.dep)\r
 \r
-CPPFLAGS += -I include/ -I $(KERNEL_SRC)include/\r
+KCPPFLAGS = -I include/ -I $(KERNEL_SRC)include/\r
 CFLAGS += -Wall -g -std=gnu99\r
 LDFLAGS += -lSDL -lSDLmain -g -Wl,--defsym,__buildnum=$(BUILD_NUM)\r
 \r
@@ -62,26 +62,26 @@ $(BIN): $(OBJ) $(N_OBJ) $(K_OBJ) $(BUILDINFO_OBJ)
 $(OBJ): obj-$(PLATFORM)/%.o: %.c\r
        @mkdir -p $(dir $@)\r
        @echo [CC] -o $@\r
-       @$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)\r
-       @$(CC) -M $(CPPFLAGS) -MT $@ -o [email protected] $<\r
+       @$(CC) -c $< -o $@ $(CFLAGS) $(KCPPFLAGS) $(CPPFLAGS)\r
+       @$(CC) -M $(CPPFLAGS) $(KCPPFLAGS) -MT $@ -o [email protected] $<\r
 \r
 $(K_OBJ): $(KERNEL_SRC)obj-native-$(PLATFORM)/%.o: $(KERNEL_SRC)%.c\r
        @mkdir -p $(dir $@)\r
        @echo [CC] -o $@\r
-       @$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)\r
-       @$(CC) -M $(CPPFLAGS) -MT $@ -o [email protected] $<\r
+       $(CC) -ffreestanding -c $< -o $@ $(CFLAGS) $(KCPPFLAGS) $(CPPFLAGS)\r
+       @$(CC) -ffreestanding -M $(KCPPFLAGS) $(CPPFLAGS) -MT $@ -o [email protected] $<\r
 \r
 \r
 $(N_OBJ): obj-$(PLATFORM)/%.o: %.c\r
        @mkdir -p $(dir $@)\r
        @echo [CC] -o $@\r
-       @$(CC) -c $< -o $@ $(CFLAGS)\r
+       @$(CC) -c $< -o $@ $(CPPFLAGS) $(CFLAGS)\r
        @$(CC) -M -MT $@ -o [email protected] $<\r
 \r
 $(BUILDINFO_SRC): $(filter-out $(BUILDINFO_OBJ), $(OBJ)) Makefile\r
        @echo "" > $@\r
-       $(eval _GITHASH=$(shell git log -n 1 | head -n 1 | awk '{print $$2}'))\r
-       $(eval _GITCHANGED=$(shell git status --porcelain | grep -c '^ M '))\r
+       $(eval _GITHASH=$(shell (git log -n 1 | head -n 1 | awk '{print $$2}') || echo UNK))\r
+       $(eval _GITCHANGED=$(shell (git status --porcelain | grep -c '^ M ') || echo UNK))\r
        @echo "const char gsKernelVersion[] = \"$(ACESS_VERSION)\";" >> $@\r
        @echo "const char gsGitHash[] = \"$(_GITHASH)\";" >> $@\r
        @echo "const char gsBuildInfo[] = \"Acess2 v$(KERNEL_VERSION) $(ARCH)-$(PLATFORM)\\\\r\\\\n\"" >> $@\r

diff --git a/AcessNative/acesskernel_src/server.c b/AcessNative/acesskernel_src/server.c
index 82d4e70..7919979 100644 (file)
--- a/AcessNative/acesskernel_src/server.c
+++ b/AcessNative/acesskernel_src/server.c
@@ -20,7 +20,6 @@ typedef int   socklen_t;
 # include <sys/socket.h>
 # include <netinet/in.h>
 # include <arpa/inet.h>        // inet_ntop
-# include "include/windows_helpers.h"
 #endif
 #define DONT_INCLUDE_SYSCALL_NAMES
 #include "../syscalls.h"