提交 f7f3d351 编写于 作者: M michaelm

7155585: Fix ifeq errors in makefiles [macosx]

Reviewed-by: andrew, anthony, ohrstrom, dsamersoff
上级 a3e3eece
...@@ -68,7 +68,7 @@ ifeq ($(PLATFORM), windows) ...@@ -68,7 +68,7 @@ ifeq ($(PLATFORM), windows)
endif endif
# Add location of iconv header # Add location of iconv header
ifeq ($(PLATFORM), macosx)) ifeq ($(PLATFORM), macosx)
OTHER_LDLIBS += -liconv OTHER_LDLIBS += -liconv
endif endif
......
...@@ -40,7 +40,7 @@ ifeq ($(PLATFORM), linux) ...@@ -40,7 +40,7 @@ ifeq ($(PLATFORM), linux)
OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread
endif endif
ifeq ($(PLATFORM), macosx)) ifeq ($(PLATFORM), macosx)
LIBSOCKET = LIBSOCKET =
OTHER_LDLIBS += -pthread OTHER_LDLIBS += -pthread
endif endif
......
...@@ -208,7 +208,7 @@ ifeq ($(PLATFORM), linux) ...@@ -208,7 +208,7 @@ ifeq ($(PLATFORM), linux)
$(wildcard /usr/include/X11/extensions)) $(wildcard /usr/include/X11/extensions))
endif endif
ifeq ($(PLATFORM), macosx)) ifeq ($(PLATFORM), macosx)
CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
-I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include
endif endif
......
...@@ -172,7 +172,7 @@ else # PLATFORM ...@@ -172,7 +172,7 @@ else # PLATFORM
# Libraries to link, and other C flags. # Libraries to link, and other C flags.
# #
ifeq ($(PLATFORM), macosx)) ifeq ($(PLATFORM), macosx)
OTHER_INCLUDES += -I$(X11_PATH)/include OTHER_INCLUDES += -I$(X11_PATH)/include
OTHER_LDLIBS += -lawt $(LIBM) $(LIBCXX) OTHER_LDLIBS += -lawt $(LIBM) $(LIBCXX)
ifeq ($(OS_VENDOR),Apple) ifeq ($(OS_VENDOR),Apple)
...@@ -197,7 +197,7 @@ endif # PLATFORM ...@@ -197,7 +197,7 @@ endif # PLATFORM
# set up compile flags.. # set up compile flags..
ifeq ($(PLATFORM), macosx)) ifeq ($(PLATFORM), macosx)
CPPFLAGS += -I$(CLASSHDRDIR) CPPFLAGS += -I$(CLASSHDRDIR)
endif endif
......
...@@ -56,7 +56,7 @@ LDFLAGS += -lpthread ...@@ -56,7 +56,7 @@ LDFLAGS += -lpthread
dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
endif endif
ifeq ($(PLATFORM), macosx)) ifeq ($(PLATFORM), macosx)
LDFLAGS += -pthread LDFLAGS += -pthread
dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
endif endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册