setting svn:eol-style=native on files, part 2

[proxmark3-svn] / common / Makefile.common

diff --git a/common/Makefile.common b/common/Makefile.common
index c1193f9aa7e2de2d4440b16e0ddba8b2f9e6139f..7072ede535306a46b91e26e52fb9d90b4a38ad77 100644 (file)
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -1,3 +1,11 @@
+#-----------------------------------------------------------------------------
+# This code is licensed to you under the terms of the GNU GPL, version 2 or,
+# at your option, any later version. See the LICENSE.txt file for the text of
+# the license.
+#-----------------------------------------------------------------------------
+# Common makefile functions for all platforms
+#-----------------------------------------------------------------------------
+

 # This new makefile replaces the previous Makefile/Makefile.linux
 # with as much common code for both environments as possible.
 # Following is a short OS detection to set up variables, all the
 # This new makefile replaces the previous Makefile/Makefile.linux
 # with as much common code for both environments as possible.
 # Following is a short OS detection to set up variables, all the


@@ -9,7 +17,7 @@
 # (The including Makefile still needs to define what 'all' is)
 all:
 
 # (The including Makefile still needs to define what 'all' is)
 all:
 

-CROSS   = arm-elf-
+CROSS  ?= arm-eabi-

 CC     = $(CROSS)gcc
 AS     = $(CROSS)as
 LD     = $(CROSS)ld
 CC     = $(CROSS)gcc
 AS     = $(CROSS)as
 LD     = $(CROSS)ld


@@ -33,7 +41,8 @@ PATHSEP=/
 FLASH_TOOL=client/flasher
 DETECTED_OS=UNAME
 # You may/should set this in your environment
 FLASH_TOOL=client/flasher
 DETECTED_OS=UNAME
 # You may/should set this in your environment

-LIBGCC ?= $(shell $(CC) -print-libgcc-file-name)
+LIBGCC ?= $(DEVKITARM)/lib/gcc/arm-eabi/4.4.2/libgcc.a
+PATH := $(PATH):$(DEVKITARM)/bin

 
 else
 
 
 else