From 4937918af52268e7ce94842af690278155fad810 Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Mon, 17 Sep 2007 13:06:36 +0000
Subject: [PATCH] updated the default linux/win32 compiler/linker config

---
 tools/cooja/config/external_tools_linux.config | 8 ++++----
 tools/cooja/config/external_tools_win32.config | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/cooja/config/external_tools_linux.config b/tools/cooja/config/external_tools_linux.config
index 3f0a0474e..50e1d8bb2 100644
--- a/tools/cooja/config/external_tools_linux.config
+++ b/tools/cooja/config/external_tools_linux.config
@@ -14,9 +14,9 @@ CMD_GREP_INTERFACES = grep "^SIM_INTERFACE([^,]*," -o -d skip -D skip -H -r
 REGEXP_PARSE_INTERFACES = ([^/]*.c):SIM_INTERFACE\\(([^,]*),
 CMD_GREP_SENSORS = grep "^SENSORS_SENSOR([^,]*," -o -d skip -D skip -H -r
 REGEXP_PARSE_SENSORS = ([^/]*.c):SENSORS_SENSOR\\(([^,]*),
-LINKER_ARGS_1 =
-LINKER_ARGS_2 =
-COMPILER_ARGS =
+COMPILER_ARGS = 
+LINK_COMMAND_1 = gcc -shared -Wl,-Map=$(MAPFILE) -o $(LIBFILE)
+LINK_COMMAND_2 = 
 CONTIKI_STANDARD_PROCESSES = sensors_process;etimer_process
 CONTIKI_MAIN_TEMPLATE_FILENAME = contiki_template.c
 MANTIS_MAIN_TEMPLATE_FILENAME = mantis_template.c
@@ -24,7 +24,7 @@ CORECOMM_TEMPLATE_FILENAME = corecomm_template.java
 PATH_JAVAC = javac
 DEFAULT_PROJECTDIRS = ../apps/mrm
 
-PARSE_WITH_NM = true
+PARSE_WITH_NM = false
 MAPFILE_DATA_START = ^.data[ \t]*0x([0-9A-Fa-f]*)[ \t]*0x[0-9A-Fa-f]*[ \t]*$
 MAPFILE_DATA_SIZE = ^.data[ \t]*0x[0-9A-Fa-f]*[ \t]*0x([0-9A-Fa-f]*)[ \t]*$
 MAPFILE_BSS_START = ^.bss[ \t]*0x([0-9A-Fa-f]*)[ \t]*0x[0-9A-Fa-f]*[ \t]*$
diff --git a/tools/cooja/config/external_tools_win32.config b/tools/cooja/config/external_tools_win32.config
index 6aa67a7b5..7a8a13397 100644
--- a/tools/cooja/config/external_tools_win32.config
+++ b/tools/cooja/config/external_tools_win32.config
@@ -14,9 +14,9 @@ CMD_GREP_INTERFACES = grep '^SIM_INTERFACE([^,]*,' -o -d skip -D skip -H -r
 REGEXP_PARSE_INTERFACES = ([^/]*.c):SIM_INTERFACE\\(([^,]*),
 CMD_GREP_SENSORS = grep '^SENSORS_SENSOR([^,]*,' -o -d skip -D skip -H -r
 REGEXP_PARSE_SENSORS = ([^/]*.c):SENSORS_SENSOR\\(([^,]*),
-LINKER_ARGS_1 = --add-stdcall-alias /usr/lib/mingw/dllcrt2.o
-LINKER_ARGS_2 = -L/usr/lib/mingw -lmingw32 -lmingwex -lmsvcrt
-COMPILER_ARGS = -mno-cygwin -I'$(JAVA_HOME)/include' -I'$(JAVA_HOME)/include/win32'
+COMPILER_ARGS = -mno-cygwin -Wall -I'$(JAVA_HOME)/include' -I'$(JAVA_HOME)/include/win32'
+LINK_COMMAND_1 = gcc -mno-cygwin -shared -Wl,-Map=$(MAPFILE) -Wl,--add-stdcall-alias -o $(LIBFILE)
+LINK_COMMAND_2 = -L/usr/lib/mingw -lmsvcrt
 CONTIKI_STANDARD_PROCESSES = sensors_process;etimer_process
 CONTIKI_MAIN_TEMPLATE_FILENAME = contiki_template.c
 MANTIS_MAIN_TEMPLATE_FILENAME = mantis_template.c