From c2ea0ba67440ed31d47eeb8459ab7d67b904bef8 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Wed, 14 Apr 2010 21:33:22 +0200 Subject: started to sync with makefiles from SMERP --- makefiles/gmake/compiler.mk | 4 ++-- makefiles/nmake/platform.mk | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/makefiles/gmake/compiler.mk b/makefiles/gmake/compiler.mk index 01e9837..e5015f0 100644 --- a/makefiles/gmake/compiler.mk +++ b/makefiles/gmake/compiler.mk @@ -309,8 +309,8 @@ endif #endif #endif -CFLAGS = $(COMPILE_FLAGS) $(PLATFORM_COMPILE_FLAGS) $(INCLUDE_DIRS) $(PTHREADS_CFLAGS) -CCPPFLAGS = $(CCPP_COMPILE_FLAGS) $(PLATFORM_COMPILE_FLAGS) $(INCLUDE_DIRS) $(PTHREADS_CFLAGS) +CFLAGS = $(COMPILE_FLAGS) $(PLATFORM_COMPILE_FLAGS) $(INCLUDE_DIRS) $(INCLUDE_CFLAGS) $(PTHREADS_CFLAGS) +CCPPFLAGS = $(CCPP_COMPILE_FLAGS) $(PLATFORM_COMPILE_FLAGS) $(INCLUDE_DIRS) $(INCLUDE_CPPFLAGS) $(PTHREADS_CFLAGS) LDFLAGS = $(INCLUDE_LDFLAGS) $(PTHREADS_LDFLAGS) $(LDFLAGS_NET) $(LDFLAGS_LT) LIBS = $(INCLUDE_LIBS) $(PTHREADS_LIBS) $(LIBS_NET) $(LIBS_LT) diff --git a/makefiles/nmake/platform.mk b/makefiles/nmake/platform.mk index 11f9aad..cb33653 100644 --- a/makefiles/nmake/platform.mk +++ b/makefiles/nmake/platform.mk @@ -9,8 +9,7 @@ # # author: Andreas Baumann, abaumann at yahoo dot com -# The location of the Windows Platform SDK -PLATFORM_SDK_DIR = C:\Programme\Microsoft Platform SDK for Windows Server 2003 R2 +!include $(TOPDIR)\makefiles\nmake\config.mk # TODO: maybe we have to probe certain things like the version # of the visual studio or the availability of certain addons -- cgit v1.2.3-54-g00ecf