X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fconfig.mk;h=1d75dc0b48b3b4a603b92e21e3fe51d0449331e8;hb=12a865a058c2c3da0e4da685158f3a506ffad876;hp=67e4dbd080d2b1ce8b1d34cce039685765514500;hpb=9fefde76822d56c8eb02d096074566bcb302c29c;p=bertos.git

diff --git a/bertos/config.mk b/bertos/config.mk
index 67e4dbd0..1d75dc0b 100644
--- a/bertos/config.mk
+++ b/bertos/config.mk
@@ -10,8 +10,6 @@
 #
 # Programmer type
 # see local pgm_config.mk for programmer customization.
--include pgm_config.mk
-DPROG ?= -V -c stk500 -P /dev/ttyS0
 
 OPTCFLAGS = -ffunction-sections -fdata-sections
 #OPTCFLAGS = -funsafe-loop-optimizations
@@ -25,7 +23,6 @@ DEBUGCFLAGS = -ggdb
 #
 # define some variables based on the AVR base path in $(AVR)
 #
-#CROSS   = avr-
 CC      = gcc
 CXX     = g++
 AR      = ar
@@ -53,7 +50,7 @@ COFFCONVERT=$(OBJCOPY) \
 	--change-section-address .noinit-0x800000 \
 	--change-section-address .eeprom-0x810000
 
-INCDIR  = -I. -Ibertos 
+INCDIR  = -I. -Ibertos -Ibertos/net/lwip/src/include -Ibertos/net/lwip/src/include/ipv4
 LIBDIR  = lib
 OBJDIR  = obj
 OUTDIR  = images
@@ -85,12 +82,14 @@ WARNFLAGS = \
 C_WARNFLAGS = \
 	-Wmissing-prototypes -Wstrict-prototypes
 
+C_COMPILER_STD = -std=gnu99
+
 # Default C preprocessor flags (for C, C++ and cpp+as)
 CPPFLAGS = $(INCDIR)
 
 # Default C compiler flags
 CFLAGS = $(OPTCFLAGS) $(DEBUGCFLAGS) $(WARNFLAGS) $(C_WARNFLAGS) \
-	$(DEP_FLAGS) $(LIST_FLAGS) -std=gnu99
+	$(DEP_FLAGS) $(LIST_FLAGS) $(C_COMPILER_STD)
 
 # Default C++ compiler flags
 CXXFLAGS = $(OPTCFLAGS) $(DEBUGCFLAGS) $(WARNFLAGS) \