X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=config.mk;h=e41cc6b049dbef9cca5cc34bda3f061d6f623946;hb=0128433e7c12a6eb7489334ca8d4a5d56e4ed8eb;hp=a3fd6417829ee1321b5698accb83eb0347ed9110;hpb=d1e077a924a016900eb030c244e6bad5ca5d7f3e;p=bertos.git

diff --git a/config.mk b/config.mk
index a3fd6417..e41cc6b0 100644
--- a/config.mk
+++ b/config.mk
@@ -49,13 +49,14 @@ DEBUGCFLAGS = -ggdb
 #
 # define some variables based on the AVR base path in $(AVR)
 #
-CROSS   = avr-
-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
+LDXX	= $(CXX)
+OBJCOPY = objcopy
+STRIP   = strip
 INSTALL = cp -a
 RM      = rm -f
 RM_R    = rm -rf
@@ -65,6 +66,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.