From 736cc5469da3e0e060dea6e44372c7798561c72d Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 13 Jan 2015 11:50:42 +0100 Subject: Use $(INCPATH) only where needed --- makefile | 5 ++--- src/lib/lib.mak | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/makefile b/makefile index a8b440a6739..0f82b74bb23 100644 --- a/makefile +++ b/makefile @@ -509,7 +509,7 @@ CPPONLYFLAGS = # CFLAGS is defined based on C or C++ targets # (remember, expansion only happens when used, so doing it here is ok) -CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS) +CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS) $(INCPATH) # we compile C-only to C89 standard with GNU extensions # we compile C++ code to C++98 standard with GNU extensions @@ -864,7 +864,6 @@ include $(SRC)/tools/tools.mak include $(SRC)/regtests/regtests.mak # combine the various definitions to one -CCOMFLAGS += $(INCPATH) CDEFS = $(DEFS) # TODO: -x c++ should not be hard-coded @@ -1020,7 +1019,7 @@ $(OBJ)/%.a: ifeq ($(TARGETOS),macosx) $(OBJ)/%.o: $(SRC)/%.m | $(OSPREBUILD) @echo Objective-C compiling $<... - $(CC) $(CDEFS) $(COBJFLAGS) $(CCOMFLAGS) -c $< -o $@ + $(CC) $(CDEFS) $(COBJFLAGS) $(CCOMFLAGS) $(INCPATH) -c $< -o $@ endif diff --git a/src/lib/lib.mak b/src/lib/lib.mak index 04b6db9ba79..5074643f06e 100644 --- a/src/lib/lib.mak +++ b/src/lib/lib.mak @@ -480,12 +480,12 @@ $(OBJ)/libportmidi.a: $(LIBPMOBJS) $(LIBOBJ)/portmidi/%.o: $(3RDPARTY)/portmidi/%.c | $(OSPREBUILD) @echo Compiling $<... - $(CC) $(CDEFS) $(PMOPTS) $(CCOMFLAGS) $(CONLYFLAGS) -I$(3RDPARTY)/portmidi/pm_common -I$(3RDPARTY)/portmidi/porttime -c $< -o $@ + $(CC) $(CDEFS) $(PMOPTS) $(CCOMFLAGS) $(CONLYFLAGS) $(INCPATH) -I$(3RDPARTY)/portmidi/pm_common -I$(3RDPARTY)/portmidi/porttime -c $< -o $@ ifeq ($(TARGETOS),macosx) $(LIBOBJ)/portmidi/%.o: $(3RDPARTY)/portmidi/%.m | $(OSPREBUILD) @echo Objective-C compiling $<... - $(CC) $(CDEFS) $(COBJFLAGS) $(CCOMFLAGS) -c $< -o $@ + $(CC) $(CDEFS) $(COBJFLAGS) $(CCOMFLAGS) $(INCPATH) -c $< -o $@ endif #------------------------------------------------- @@ -544,7 +544,7 @@ $(LIBOBJ)/lua/%.o: $(3RDPARTY)/lua/src/%.c | $(OSPREBUILD) $(LIBOBJ)/lua/lsqlite3/%.o: $(3RDPARTY)/lsqlite3/%.c | $(OSPREBUILD) @echo Compiling $<... - $(CC) $(CDEFS) $(CCOMFLAGS) $(CONLYFLAGS) -DLUA_COMPAT_ALL $(LUA_FLAGS) -c $< -o $@ + $(CC) $(CDEFS) $(CCOMFLAGS) $(CONLYFLAGS) -DLUA_COMPAT_ALL -I$(3RDPARTY)/lua/src -I$(3RDPARTY) $(LUA_FLAGS) -c $< -o $@ #------------------------------------------------- # web library objects -- cgit v1.2.3