Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/9fd123fffcc03b0bc943dc94446a5757e5c63047
...commit
http://git.netsurf-browser.org/toolchains.git/commit/9fd123fffcc03b0bc943dc94446a5757e5c63047
...tree
http://git.netsurf-browser.org/toolchains.git/tree/9fd123fffcc03b0bc943dc94446a5757e5c63047
The branch, ashmew2/kolibrios has been updated
via 9fd123fffcc03b0bc943dc94446a5757e5c63047 (commit)
from 45c332a4a206373dcf14030492b6fa46d1b3185c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=9fd123fffcc03b0bc943dc94446a5757e5c63047
commit 9fd123fffcc03b0bc943dc94446a5757e5c63047
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
Pull SDK and set up libs for kos32-gcc
diff --git a/kos32-gcc/Makefile b/kos32-gcc/Makefile
index 10a6f86..6cd119a 100644
--- a/kos32-gcc/Makefile
+++ b/kos32-gcc/Makefile
@@ -4,15 +4,18 @@ KOS32_DIR := /opt/netsurf/kos32-gcc/
ENVDIR := $(KOS32_DIR)/env
SVN_CHECKOUT := $(ENVDIR)/kolibrios
PATH := $(PATH):/opt/netsurf/kos32-gcc/cross/autobuild/tools/win32/bin
+COMPILER_INSTALL_PATH := /opt/netsurf/kos32-gcc/cross/autobuild/tools
-COMPILER_INSTALL_PATH := /opt/netsurf/kos32-gcc/cross/autobuild/tools/
COMPILER_NAME := x86_64-linux-kos32-4.8.5.7z
COMPILER_URL :=
http://ftp.kolibrios.org/users/Serge/new/Toolchain/$(COMPILER_NAME)
+SDK_NAME := sdk-28-10-16.7z
+SDK_URL := http://ftp.kolibrios.org/users/Serge/new/Toolchain/$(SDK_NAME)
+
OBJDIR := $(ENVDIR)/obj
COMPILE := kos32-gcc -c -fno-ident -fomit-frame-pointer -U__WIN32__
-I$(SVN_CHECKOUT)/contrib/sdk/sources/newlib/libc/include -U_Win32 -U_WIN32
-U__MINGW32__ -UWIN32 -U__BSD_VISIBLE
-all: clean kolibri-compiler kolibri-svn kolibri-libs
+all: clean kolibri-svn kolibri-compiler kolibri-sdk kolibri-libs
kolibri-compiler:
mkdir -p $(COMPILER_INSTALL_PATH)
wget $(COMPILER_URL)
@@ -30,6 +33,13 @@ kolibri-libs:
$(COMPILE) $(SVN_CHECKOUT)/programs/develop/libraries/iconv/iconv.c -o
$(OBJDIR)/iconv.o
fasm $(SVN_CHECKOUT)/contrib/C_Layer/ASM/loadhttp.asm
$(OBJDIR)/loadhttp.obj
+kolibri-sdk:
+ mkdir -p $(COMPILER_INSTALL_PATH)/win32
+ wget $(SDK_URL)
+ mv $(SDK_NAME) $(COMPILER_INSTALL_PATH)/win32/
+ cd $(COMPILER_INSTALL_PATH)/win32/ && 7z x $(SDK_NAME)
+ rm -f $(COMPILER_INSTALL_PATH)/win32/$(SDK_NAME)
+
clean:
rm -f $(OBJDIR)/*
- rm -rf $(KOS32_DIR)
+ rm -rf $(KOS32_DIR)/cross
-----------------------------------------------------------------------
Summary of changes:
kos32-gcc/Makefile | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/kos32-gcc/Makefile b/kos32-gcc/Makefile
index 10a6f86..6cd119a 100644
--- a/kos32-gcc/Makefile
+++ b/kos32-gcc/Makefile
@@ -4,15 +4,18 @@ KOS32_DIR := /opt/netsurf/kos32-gcc/
ENVDIR := $(KOS32_DIR)/env
SVN_CHECKOUT := $(ENVDIR)/kolibrios
PATH := $(PATH):/opt/netsurf/kos32-gcc/cross/autobuild/tools/win32/bin
+COMPILER_INSTALL_PATH := /opt/netsurf/kos32-gcc/cross/autobuild/tools
-COMPILER_INSTALL_PATH := /opt/netsurf/kos32-gcc/cross/autobuild/tools/
COMPILER_NAME := x86_64-linux-kos32-4.8.5.7z
COMPILER_URL :=
http://ftp.kolibrios.org/users/Serge/new/Toolchain/$(COMPILER_NAME)
+SDK_NAME := sdk-28-10-16.7z
+SDK_URL := http://ftp.kolibrios.org/users/Serge/new/Toolchain/$(SDK_NAME)
+
OBJDIR := $(ENVDIR)/obj
COMPILE := kos32-gcc -c -fno-ident -fomit-frame-pointer -U__WIN32__
-I$(SVN_CHECKOUT)/contrib/sdk/sources/newlib/libc/include -U_Win32 -U_WIN32
-U__MINGW32__ -UWIN32 -U__BSD_VISIBLE
-all: clean kolibri-compiler kolibri-svn kolibri-libs
+all: clean kolibri-svn kolibri-compiler kolibri-sdk kolibri-libs
kolibri-compiler:
mkdir -p $(COMPILER_INSTALL_PATH)
wget $(COMPILER_URL)
@@ -30,6 +33,13 @@ kolibri-libs:
$(COMPILE) $(SVN_CHECKOUT)/programs/develop/libraries/iconv/iconv.c -o
$(OBJDIR)/iconv.o
fasm $(SVN_CHECKOUT)/contrib/C_Layer/ASM/loadhttp.asm
$(OBJDIR)/loadhttp.obj
+kolibri-sdk:
+ mkdir -p $(COMPILER_INSTALL_PATH)/win32
+ wget $(SDK_URL)
+ mv $(SDK_NAME) $(COMPILER_INSTALL_PATH)/win32/
+ cd $(COMPILER_INSTALL_PATH)/win32/ && 7z x $(SDK_NAME)
+ rm -f $(COMPILER_INSTALL_PATH)/win32/$(SDK_NAME)
+
clean:
rm -f $(OBJDIR)/*
- rm -rf $(KOS32_DIR)
+ rm -rf $(KOS32_DIR)/cross
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
