[ro-oslib-commits] SF.net SVN: ro-oslib: [265] branches/simplified-build/!OsLib/Source

[<jt...@us...>]

Revision: 265
          http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=265&view=rev
Author:   jtytgat
Date:     2007-05-06 09:02:51 -0700 (Sun, 06 May 2007)

Log Message:
-----------
- Defined TOPHEADERDIR.
- Defined CXX
- Exported ASMEXT, OSLIBLIB and OSLIBCSTRONG.
- Use the CPP preprocessor for assembler targets.
- Makefile.setup.CROSSGCC_ELF: removed -mapcs32 assembler option (non existing option).

Modified Paths:
--------------
    branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF
    branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF

Modified: branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF
===================================================================
--- branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF	2007-05-06 15:59:17 UTC (rev 264)
+++ branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF	2007-05-06 16:02:51 UTC (rev 265)
@@ -12,7 +12,8 @@
 export BUILDDIR := $(SOURCEDIR)/Build
 export RELEASEDIR := $(SOURCEDIR)/../Release
 
-export HEADERDIR := $(BUILDDIR)/Header/oslib
+export TOPHEADERDIR := $(BUILDDIR)/Header
+export HEADERDIR := $(TOPHEADERDIR)/oslib
 export CSTRONGDIR := $(BUILDDIR)/CStrong
 export OBJDIR := $(BUILDDIR)/Objs
 export OBJEXCEPTDIR := $(BUILDDIR)/Objs/Exceptions
@@ -25,14 +26,15 @@
 export PATH := $(GCCSDK_INSTALL_CROSSBIN):$(PATH)
 
 export CC := gcc
-export AS := gcc -c -xassembler -I.. -I$(SOURCEDIR)/Types -mapcs-32 -Wa,-apcs32
+export CXX := g++
+export AS := gcc -c -xassembler-with-cpp -I.. -I$(SOURCEDIR)/Types -mapcs-32 -Wa,-apcs32
 export LIBFILE := libfile -c
 export MKDIR := mkdir -p
 export RM := rm -rf
 export CP := cp -r
 export INSTALL := $(GCCSDK_INSTALL_ENV)/ro-install
 
-ASMEXT = .asm
+export ASMEXT := .asm
 
-OSLIBLIB = $(BUILDDIR)/OSLib32.o
-OSLIBCSTRONG = $(BUILDDIR)/OSLib,3d6
+export OSLIBLIB := $(BUILDDIR)/OSLib32.o
+export OSLIBCSTRONG := $(BUILDDIR)/OSLib,3d6

Modified: branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF
===================================================================
--- branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF	2007-05-06 15:59:17 UTC (rev 264)
+++ branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF	2007-05-06 16:02:51 UTC (rev 265)
@@ -12,7 +12,8 @@
 export BUILDDIR := $(SOURCEDIR)/Build
 export RELEASEDIR := $(SOURCEDIR)/../Release
 
-export HEADERDIR := $(BUILDDIR)/Header/oslib
+export TOPHEADERDIR := $(BUILDDIR)/Header
+export HEADERDIR := $(TOPHEADERDIR)/oslib
 export CSTRONGDIR := $(BUILDDIR)/CStrong
 export OBJDIR := $(BUILDDIR)/Objs
 export OBJEXCEPTDIR := $(BUILDDIR)/Objs/Exceptions
@@ -25,14 +26,15 @@
 export PATH := $(GCCSDK_INSTALL_CROSSBIN):$(PATH)
 
 export CC := arm-unknown-riscos-gcc
-export AS := arm-unknown-riscos-gcc -c -xassembler -I.. -I$(SOURCEDIR)/Types -mapcs32
+export CXX := arm-unknown-riscos-g++
+export AS := arm-unknown-riscos-gcc -c -xassembler-with-cpp -I.. -I$(SOURCEDIR)/Types
 export LIBFILE := arm-unknown-riscos-ar rs
 export MKDIR := mkdir -p
 export RM := rm -rf
 export CP := cp -r
 export INSTALL := $(GCCSDK_INSTALL_ENV)/ro-install
 
-ASMEXT = .gas
+export ASMEXT := .gas
 
-OSLIBLIB = $(BUILDDIR)/OSLib32.o
-OSLIBCSTRONG = $(BUILDDIR)/OSLib,3d6
+export OSLIBLIB := $(BUILDDIR)/OSLib32.o
+export OSLIBCSTRONG := $(BUILDDIR)/OSLib,3d6


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.