From 92054a78163fadc56825a9dce3f9be49dad7c206 Mon Sep 17 00:00:00 2001 From: Serhii Sakhno Date: Thu, 30 Jun 2016 16:20:45 +0000 Subject: [PATCH] fix include path git-svn-id: svn://kolibrios.org@6459 a494cfbc-eb01-0410-851d-a64ba20cac60 --- contrib/C_Layer/ASM/loadhttp.asm | 12 +++---- contrib/C_Layer/ASM/loadproclib.asm | 6 ++-- .../C_Layer/EXAMPLE/libguic_kolibri/Makefile | 35 +++++++++++++++++++ 3 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 contrib/C_Layer/EXAMPLE/libguic_kolibri/Makefile diff --git a/contrib/C_Layer/ASM/loadhttp.asm b/contrib/C_Layer/ASM/loadhttp.asm index 0a38c225e4..4892278980 100644 --- a/contrib/C_Layer/ASM/loadhttp.asm +++ b/contrib/C_Layer/ASM/loadhttp.asm @@ -3,14 +3,14 @@ use32 ; Tell compiler to use 32 bit instructio section '.flat' code ; Keep this line before includes or GCC messes up call addresses -include 'struct.inc' -include 'proc32.inc' -include 'macros.inc' +include '../../../programs/struct.inc' +include '../../../programs/proc32.inc' +include '../../../programs/macros.inc' purge section,mov,add,sub -include 'network.inc' -include 'http.inc' -include 'dll.inc' +include '../../../programs/network.inc' +include '../../../programs/develop/libraries/http/http.inc' +include '../../../programs/dll.inc' virtual at 0 http_msg http_msg diff --git a/contrib/C_Layer/ASM/loadproclib.asm b/contrib/C_Layer/ASM/loadproclib.asm index 51a812bcbe..08cdd92553 100644 --- a/contrib/C_Layer/ASM/loadproclib.asm +++ b/contrib/C_Layer/ASM/loadproclib.asm @@ -4,11 +4,11 @@ use32 ; Tell compiler to use 32 bit instructio section '.init' code ; Keep this line before includes or GCC messes up call addresses -include 'proc32.inc' -include 'macros.inc' +include '../../../programs/proc32.inc' +include '../../../programs/macros.inc' purge section,mov,add,sub -include 'dll.inc' +include '../../../programs/dll.inc' public init_proclib as '_init_proclib_asm' ;;; Returns 0 on success. -1 on failure. diff --git a/contrib/C_Layer/EXAMPLE/libguic_kolibri/Makefile b/contrib/C_Layer/EXAMPLE/libguic_kolibri/Makefile new file mode 100644 index 0000000000..b6e9085ac9 --- /dev/null +++ b/contrib/C_Layer/EXAMPLE/libguic_kolibri/Makefile @@ -0,0 +1,35 @@ +NAME=boardmsg +CC = kos32-gcc +LD = kos32-ld + +SDK_DIR:= $(abspath ../../../sdk) +CLAYER:= $(abspath ../../) + +LDFLAGS = -static -S -nostdlib -T $(SDK_DIR)/sources/newlib/app.lds \ + --image-base 0 -lgcc /home/autobuild/tools/win32/lib/libdll.a\ + /home/autobuild/tools/win32/lib/libc.dll.a\ + /home/autobuild/tools/win32/lib/libapp.a + +CFLAGS = -g -U_Win32 -U_WIN32 -U__MINGW32__ + +INCLUDES= -I. -I$(SDK_DIR)/sources/newlib/libc/include -I$(CLAYER)/INCLUDE +LIBPATH:= -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/mingw32/lib + +OBJPATH = $(CLAYER)/OBJ + +SOURCES = boardmsg.c + +OBJECTS = $(patsubst %.c, %.o, $(SOURCES)) + +all:$(NAME) + +$(NAME): $(OBJECTS) Makefile + $(LD) $(LIBPATH) -o $@ $(OBJECTS) $(OBJPATH)/loadboxlib.obj $(LDFLAGS) + #-ldll -lc.dll -lapp -Map $(NAME).map + kos32-objcopy $@ -O binary + +%.o : %.c Makefile + $(CC) -c $(INCLUDES) $(CFLAGS) -o $@ $< + +clean: + -rm -f *.o