git-svn-id: https://s1.saphirion.com/svn/rm-asset/trunk/r3@5300 0b15d…

…6fc-ce89-4483-8625-0b0fabc32e25

.gitignore

@@ -2,12 +2,18 @@
 ## REBOL R3
 #################
 
-make/r3*
+make/r3.dll
+make/r3-core.exe
+make/r3-core-host.exe
+make/r3-view.exe
+make/r3-view-host.exe
 make/objs/
 src/boot/boot-code.r
 src/core/b-boot.c
 src/include/ext-types.h
-src/include/host-*
+src/include/host-ext-*
+src/include/host-init.h
+src/include/host-lib.h
 src/include/reb-dialect.h
 src/include/reb-evtypes.h
 src/include/reb-lib-lib.h

NOTICE

@@ -1,6 +1,7 @@
 REBOL [R3] Language Interpreter and Run-time Environment
 Copyright 2012 REBOL Technologies
 REBOL is a trademark of REBOL Technologies
+Additional code modifications and improvements Copyright 2012 Saphirion
 Licensed under the Apache License, Version 2.0
 See included LICENSE file for details
 
@@ -32,3 +33,21 @@ This file is part of the Independent JPEG Group's software.
 dtoa:
 The author of this software is David M. Gay.
 Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
+
+bigint:
+Copyright (c) 2007, Cameron Rich
+
+AES:
+Copyright (c) 2007, Cameron Rich
+
+DH:
+Copyright (c) 2013 Richard Smolak
+
+RC4:
+Copyright (c) 2007, Cameron Rich
+
+LodePNG:
+Copyright (c) 2005-2013 Lode Vandevenne
+
+Anti-Grain Geometry:
+Copyright (C) 2002-2005 Maxim Shemanarev

make/makefile-linux

@@ -1,20 +1,15 @@
-# REBOL Makefile -- Generated by make-make.r (do not edit) on 1-Jul-2013/2:53:55+2:00
-# This makefile is intentional kept simple to make builds possible on
-# a wider range of target platforms.
-
-# To regenerate this file:
-#    make make
-
-# To generate this file for a different platform, check systems.r file
-# and provide an OS_ID (from the systems table). Linux 2.5 for example:
-#    make make OS_ID=0.4.3
-
+# REBOL Makefile --  version for Linux
+#
+# NOTE: This Makefile is temporary solution for now. It will be later replaced with multiplatform solution (CMAKE)
+#
 # To cross compile using a different toolchain and include files:
 #    $TOOLS - should point to bin where gcc is found
 #    $INCL  - should point to the dir for includes
 # Example make:
 #    make TOOLS=~/amiga/amiga/bin/ppc-amigaos- INCL=/SDK/newlib/include
 
+MAKEFILE = makefile-linux
+
 # For the build toolchain:
 CC=	$(TOOLS)gcc
 CXX  = $(TOOLS)g++
@@ -65,7 +60,7 @@ R3=	$(CD)r3$(BIN_SUFFIX) -qs
 R3LIB= libr3.so
 ### Build targets:
 top:
-	make r3$(BIN_SUFFIX)
+	$(MAKE) -f $(MAKEFILE) r3$(BIN_SUFFIX)
 
 update:
 	-cd $(UP)/; cvs -q update src
@@ -77,12 +72,12 @@ clean:
 	@-rm -rf $(R3LIB) r3-core-host$(BIN_SUFFIX) r3-view-host$(BIN_SUFFIX) r3-core$(BIN_SUFFIX) r3-view$(BIN_SUFFIX) objs/ 
 
 all:
-	make clean
-	make lib
-	make r3-core-host$(BIN_SUFFIX) HOST_PRODUCT_NAME=saphir-core-host
-	make r3-view-host$(BIN_SUFFIX) HOST_PRODUCT_NAME=saphir-view-host
-	make r3-core$(BIN_SUFFIX) HOST_PRODUCT_NAME=saphir-core
-	make r3-view$(BIN_SUFFIX) HOST_PRODUCT_NAME=saphir-view 
+	$(MAKE) -f $(MAKEFILE) clean
+	$(MAKE) -f $(MAKEFILE) lib
+	$(MAKE) -f $(MAKEFILE) r3-core-host$(BIN_SUFFIX) HOST_PRODUCT_NAME=saphir-core-host
+	$(MAKE) -f $(MAKEFILE) r3-view-host$(BIN_SUFFIX) HOST_PRODUCT_NAME=saphir-view-host
+	$(MAKE) -f $(MAKEFILE) r3-core$(BIN_SUFFIX) HOST_PRODUCT_NAME=saphir-core
+	$(MAKE) -f $(MAKEFILE) r3-view$(BIN_SUFFIX) HOST_PRODUCT_NAME=saphir-view 
 
 prep-lib:
 	$(REBOL) $T/make-headers.r
@@ -92,13 +87,13 @@ prep-lib:
 	-rm -f $(OBJS) 
 
 prep-core:
-	$(REBOL) $T/rma-init.r $(HOST_PRODUCT_NAME)
+	$(REBOL) $T/saphir-init.r $(HOST_PRODUCT_NAME)
 	$(REBOL) $T/core-ext.r
 	$(eval HOST_FLAGS =$(HOST_CORE_FLAGS))
 	-rm -f $(HOST)
 
 prep-view:
-	$(REBOL) $T/rma-init.r $(HOST_PRODUCT_NAME)
+	$(REBOL) $T/saphir-init.r $(HOST_PRODUCT_NAME)
 	$(REBOL) $T/core-ext.r
 	$(REBOL) $T/view-ext.r
 	$(eval HOST_FLAGS =$(HOST_VIEW_FLAGS))
@@ -108,8 +103,8 @@ prep-view:
 purge:
 	-rm libr3.*
 	-rm host$(BIN_SUFFIX)
-	make lib
-	make host$(BIN_SUFFIX)
+	$(MAKE) -f $(MAKEFILE) lib
+	$(MAKE) -f $(MAKEFILE) host$(BIN_SUFFIX)
 
 test:
 	$(CP) r3$(BIN_SUFFIX) $(UP)/src/tests/

make/makefile-win → make/makefile-msys

@@ -1,28 +1,23 @@
-# REBOL Makefile -- Generated by make-make.r (do not edit) on 14-Dec-2012/17:39:21+1:00
-# This makefile is intentional kept simple to make builds possible on
-# a wider range of target platforms.
-
-# To regenerate this file:
-#    make make
-
-# To generate this file for a different platform, check systems.r file
-# and provide an OS_ID (from the systems table). Linux 2.5 for example:
-#    make make OS_ID=0.4.3
-
+# REBOL Makefile --  version for Windows with MSYS
+#
+# NOTE: This Makefile is temporary solution for now. It will be later replaced with multiplatform solution (CMAKE)
+#
 # To cross compile using a different toolchain and include files:
 #    $TOOLS - should point to bin where gcc is found
 #    $INCL  - should point to the dir for includes
 # Example make:
 #    make TOOLS=~/amiga/amiga/bin/ppc-amigaos- INCL=/SDK/newlib/include
 
+MAKEFILE = makefile-msys
+
 # For the build toolchain:
 CC=	$(TOOLS)gcc
 STRIP=	$(TOOLS)strip
 
 # CP allows different copy progs:
 CP=	 cp
 # LS allows different ls progs:
-LS=	-dir
+LS=	cmd //C dir
 # UP - some systems do not use ../
 UP=	 ..
 # CD - some systems do not use ./
@@ -69,7 +64,7 @@ R3LIB= r3.dll
 
 ### Build targets:
 top:
-	make r3-core
+	$(MAKE) -f $(MAKEFILE) r3-core
 
 update:
 	-cd $(UP)/; cvs -q update src
@@ -81,14 +76,14 @@ clean:
 	@-rm -rf $(R3LIB) r3-core-host$(BIN_SUFFIX) r3-view-host$(BIN_SUFFIX) r3-core$(BIN_SUFFIX) r3-view$(BIN_SUFFIX) encap-view$(BIN_SUFFIX) encap-core$(BIN_SUFFIX) objs/
 
 all:
-	make clean
-	make lib
-	make r3-core-host HOST_PRODUCT_NAME=saphir-core-host
-	make r3-view-host HOST_PRODUCT_NAME=saphir-view-host
-	make r3-core HOST_PRODUCT_NAME=saphir-core
-	make r3-view HOST_PRODUCT_NAME=saphir-view
-	make encap-core HOST_PRODUCT_NAME=saphir-core-encap
-	make encap-view HOST_PRODUCT_NAME=saphir-view-encap
+	$(MAKE) -f $(MAKEFILE) clean
+	$(MAKE) -f $(MAKEFILE) lib
+	$(MAKE) -f $(MAKEFILE) r3-core-host HOST_PRODUCT_NAME=saphir-core-host
+	$(MAKE) -f $(MAKEFILE) r3-view-host HOST_PRODUCT_NAME=saphir-view-host
+	$(MAKE) -f $(MAKEFILE) r3-core HOST_PRODUCT_NAME=saphir-core
+	$(MAKE) -f $(MAKEFILE) r3-view HOST_PRODUCT_NAME=saphir-view
+	$(MAKE) -f $(MAKEFILE) encap-core HOST_PRODUCT_NAME=saphir-core-encap
+	$(MAKE) -f $(MAKEFILE) encap-view HOST_PRODUCT_NAME=saphir-view-encap
 
 prep-lib:
 	$(REBOL) $T/make-headers.r
@@ -98,13 +93,13 @@ prep-lib:
 	-rm -f $(OBJS)
 
 prep-core:
-	$(REBOL) $T/rma-init.r $(HOST_PRODUCT_NAME)
+	$(REBOL) $T/saphir-init.r $(HOST_PRODUCT_NAME)
 	$(REBOL) $T/core-ext.r
 	$(eval HOST_FLAGS =$(HOST_CORE_FLAGS))
 	-rm -f $(HOST)
 
 prep-view:
-	$(REBOL) $T/rma-init.r $(HOST_PRODUCT_NAME)
+	$(REBOL) $T/saphir-init.r $(HOST_PRODUCT_NAME)
 	$(REBOL) $T/core-ext.r
 	$(REBOL) $T/view-ext.r
 	$(eval HOST_FLAGS =$(HOST_VIEW_FLAGS))
@@ -148,8 +143,8 @@ prep-encap-boot-core:
 purge:
 	-rm $(R3LIB)
 	-rm host$(BIN_SUFFIX)
-	make lib
-	make r3-core-host
+	$(MAKE) -f $(MAKEFILE) lib
+	$(MAKE) -f $(MAKEFILE) r3-core-host
 
 test:
 	$(CP) r3$(BIN_SUFFIX) $(UP)/src/tests/
@@ -265,13 +260,13 @@ r3-view: prep-view objs $(OBJS) $(HOST) $(GFX) $(AGG)
 
 # r3/view/encap executable:
 encap-view: objs
-	make encap-boot-view
-	make encap-exe-view
+	$(MAKE) -f $(MAKEFILE) encap-boot-view
+	$(MAKE) -f $(MAKEFILE) encap-exe-view
 
 # r3/core/encap executable:
 encap-core: objs
-	make encap-boot-core
-	make encap-exe-core
+	$(MAKE) -f $(MAKEFILE) encap-boot-core
+	$(MAKE) -f $(MAKEFILE) encap-exe-core
 
 encap-exe-view: prep-encap-view $(OBJS) $(HOST_ENCAP) $(HOST) $(GFX) $(AGG)
 	$(CC) -o encap-view$(BIN_SUFFIX) $(OBJS) $(HOST_ENCAP) $(HOST) $(GFX) $(AGG) $(GUI_CLIB)

make/makefile-osx

@@ -1,20 +1,15 @@
-# REBOL Makefile -- Generated by make-make.r (do not edit) on 1-Jun-2013/13:32:43+2:00
-# This makefile is intentional kept simple to make builds possible on
-# a wider range of target platforms.
-
-# To regenerate this file:
-#    make make
-
-# To generate this file for a different platform, check systems.r file
-# and provide an OS_ID (from the systems table). Linux 2.5 for example:
-#    make make OS_ID=0.4.3
-
+# REBOL Makefile --  version for OSX PPC
+#
+# NOTE: This Makefile is temporary solution for now. It will be later replaced with multiplatform solution (CMAKE)
+#
 # To cross compile using a different toolchain and include files:
 #    $TOOLS - should point to bin where gcc is found
 #    $INCL  - should point to the dir for includes
 # Example make:
 #    make TOOLS=~/amiga/amiga/bin/ppc-amigaos- INCL=/SDK/newlib/include
 
+MAKEFILE = makefile-osx
+
 # For the build toolchain:
 CC=	$(TOOLS)gcc
 CXX  = $(TOOLS)g++
@@ -67,7 +62,7 @@ R3LIB= libr3.dylib
 
 ### Build targets:
 top:
-	make r3$(BIN_SUFFIX)
+	$(MAKE) -f $(MAKEFILE) r3$(BIN_SUFFIX)
 
 update:
 	-cd $(UP)/; cvs -q update src
@@ -79,12 +74,12 @@ clean:
 	@-rm -rf $(R3LIB) r3-core-host$(BIN_SUFFIX) r3-view-host$(BIN_SUFFIX) r3-core$(BIN_SUFFIX) r3-view$(BIN_SUFFIX) objs/ 
 
 all:
-	make clean
-	make lib
-	make r3-core-host$(BIN_SUFFIX) HOST_PRODUCT_NAME=saphir-core-host
-	make r3-view-host$(BIN_SUFFIX) HOST_PRODUCT_NAME=saphir-view-host
-	make r3-core$(BIN_SUFFIX) HOST_PRODUCT_NAME=saphir-core
-	make r3-view$(BIN_SUFFIX) HOST_PRODUCT_NAME=saphir-view 
+	$(MAKE) -f $(MAKEFILE) clean
+	$(MAKE) -f $(MAKEFILE) lib
+	$(MAKE) -f $(MAKEFILE) r3-core-host$(BIN_SUFFIX) HOST_PRODUCT_NAME=saphir-core-host
+	$(MAKE) -f $(MAKEFILE) r3-view-host$(BIN_SUFFIX) HOST_PRODUCT_NAME=saphir-view-host
+	$(MAKE) -f $(MAKEFILE) r3-core$(BIN_SUFFIX) HOST_PRODUCT_NAME=saphir-core
+	$(MAKE) -f $(MAKEFILE) r3-view$(BIN_SUFFIX) HOST_PRODUCT_NAME=saphir-view 
 
 prep-lib:
 	$(REBOL) $T/make-headers.r
@@ -94,13 +89,13 @@ prep-lib:
 	-rm -f $(OBJS) 
 
 prep-core:
-	$(REBOL) $T/rma-init.r $(HOST_PRODUCT_NAME)
+	$(REBOL) $T/saphir-init.r $(HOST_PRODUCT_NAME)
 	$(REBOL) $T/core-ext.r
 	$(eval HOST_FLAGS =$(HOST_CORE_FLAGS))
 	-rm -f $(HOST)
 
 prep-view:
-	$(REBOL) $T/rma-init.r $(HOST_PRODUCT_NAME)
+	$(REBOL) $T/saphir-init.r $(HOST_PRODUCT_NAME)
 	$(REBOL) $T/core-ext.r
 	$(REBOL) $T/view-ext.r
 	$(eval HOST_FLAGS =$(HOST_VIEW_FLAGS))
@@ -110,8 +105,8 @@ prep-view:
 purge:
 	-rm libr3.*
 	-rm host$(BIN_SUFFIX)
-	make lib
-	make host$(BIN_SUFFIX)
+	$(MAKE) -f $(MAKEFILE) lib
+	$(MAKE) -f $(MAKEFILE) host$(BIN_SUFFIX)
 
 test:
 	$(CP) r3$(BIN_SUFFIX) $(UP)/src/tests/