X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=config.mk;h=0d4c387c2e77ee9a9c9ef7f7b5b2e76fc853cc9f;hb=db978d8c104700d20a99c5bc9711574bdb9589fe;hp=c0473a157967ec98b33fce8a110ccac7b1277eba;hpb=c41eed7d175c38a0e247544d505be0ef7c3f0a4b;p=bertos.git

diff --git a/config.mk b/config.mk
index c0473a15..0d4c387c 100644
--- a/config.mk
+++ b/config.mk
@@ -10,39 +10,6 @@
 # Author: Bernardo Innocenti <bernie@develer.com>
 #
 # $Log$
-# Revision 1.12  2007/09/29 16:57:39  bernie
-# Better sparse support.
-#
-# Revision 1.11  2007/09/29 15:54:14  bernie
-# Make demo Qt emulator compile again.
-#
-# Revision 1.10  2007/09/18 10:17:00  batt
-# Merge from triface.
-#
-# Revision 1.9  2006/09/20 14:28:42  marco
-# Add MOC. Changed OPTCFLAGS.
-#
-# Revision 1.8  2006/09/19 17:50:56  bernie
-# Make native build the default.
-#
-# Revision 1.7  2006/07/19 12:56:24  bernie
-# Convert to new Doxygen style.
-#
-# Revision 1.6  2006/06/12 22:05:09  marco
-# Bring back config wrongly commited
-#
-# Revision 1.4  2006/05/27 22:41:46  bernie
-# Tweak optimization flags for loops.
-#
-# Revision 1.3  2006/05/18 00:40:10  bernie
-# Setup for AVR development.
-#
-# Revision 1.2  2006/03/27 04:48:33  bernie
-# Add CXXFLAGS; Add recursive targets.
-#
-# Revision 1.1  2006/03/22 09:51:53  bernie
-# Add build infrastructure.
-#
 #
 
 #
@@ -82,13 +49,13 @@ DEBUGCFLAGS = -ggdb
 #
 # define some variables based on the AVR base path in $(AVR)
 #
-CROSS   = arm-elf-
-CC      = $(CROSS)gcc
-CXX     = $(CROSS)g++
+#CROSS   = avr-
+CC      = gcc
+CXX     = g++
 AS      = $(CC) -x assembler-with-cpp
 LD      = $(CC)
-OBJCOPY = $(CROSS)objcopy
-STRIP   = $(CROSS)strip
+OBJCOPY = objcopy
+STRIP   = strip
 INSTALL = cp -a
 RM      = rm -f
 RM_R    = rm -rf
@@ -98,6 +65,7 @@ SHELL   = /bin/sh
 CHECKER = sparse
 DOXYGEN = doxygen
 AVRDUDE = avrdude
+MOC     = moc-qt4
 FLEXCAT = $(top_srcdir)/tools/flexcat/flexcat
 
 # For conversion from ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
@@ -127,7 +95,7 @@ LIST_FLAGS = -Wa,-anhlmsd=$(@:.o=.lst)
 ifeq ($(EMBEDDED_TARGET), 1)
 MAP_FLAGS = -Wl,-Map=$(@:%.elf=%.map),--cref
 else
-MAP_FLAGS = 
+MAP_FLAGS =
 endif
 
 # Compiler warning flags for both C and C++