Added -I/usr/X11R6/include to osgProducer and all the examples GNUMakefiles.
From Bob, mods to GNUMakefile and Make/makedefs for the extra includes for freetype.
This commit is contained in:
@@ -15,12 +15,8 @@ INC += -I$(OSGHOME)/include \
|
||||
-I/usr/local/include/freetype2 \
|
||||
-I/usr/freeware/include \
|
||||
-I/usr/freeware/include/freetype2
|
||||
|
||||
LINKARGS += -L/usr/local/lib\
|
||||
-L/usr/freeware/lib$(ARCH)
|
||||
else
|
||||
INC += $(FREETYPE_INCLUDE)
|
||||
endif
|
||||
INC += $(FREETYPE_INCLUDE)
|
||||
|
||||
TARGET_BASENAME = freetype
|
||||
include $(TOPDIR)/Make/cygwin_plugin_def
|
||||
|
||||
@@ -11,11 +11,11 @@ CXXFILES =\
|
||||
|
||||
LIBS += -lProducer $(GL_LIBS) -losgText -losgGA -losgUtil -losgDB -losg $(OTHER_LIBS)
|
||||
DEF += -DOSGPRODUCER_LIBRARY
|
||||
INC += -I/usr/X11R6/include
|
||||
|
||||
TARGET_BASENAME = osgProducer
|
||||
LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT)
|
||||
|
||||
INC += $(PRODUCER_INCLUDE_DIR)
|
||||
INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
|
||||
LDFLAGS += $(PRODUCER_LIB_DIR)
|
||||
|
||||
include $(TOPDIR)/Make/makerules
|
||||
|
||||
Reference in New Issue
Block a user