FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Addeed LIBXML2_INCLUDE defined to Make/makedefs to handle non standard placement of

Browse Source 
libxml2 in OSX.
This commit is contained in:
Robert Osfield 2003-09-10 19:55:14 +00:00
parent f5b4f7ace0
commit c1166cf3d5
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Make/makedefs
View File

@ -103,6 +103,8 @@ PLUGIN_EXT = so
MAKEDIST = echo " === Distribution build is not implemented yet for $(OS)"; printf "\n" MAKEDIST = echo " === Distribution build is not implemented yet for $(OS)"; printf "\n"
INSTLOGFILE = /tmp/.osg_inst_log INSTLOGFILE = /tmp/.osg_inst_log
LIBXML2_INCLUDE = -I/usr/include/libxml2
ifneq ("$(OPENTHREADS_INC_DIR)","") ifneq ("$(OPENTHREADS_INC_DIR)","")
INC += -I$(OPENTHREADS_INC_DIR) INC += -I$(OPENTHREADS_INC_DIR)
endif endif
@ -403,9 +405,10 @@ ifeq ($(OS),Darwin)
SOCKET_LIBS = SOCKET_LIBS =
OTHER_LIBS = -lm -lstdc++ -lobjc -lOpenThreads OTHER_LIBS = -lm -lstdc++ -lobjc -lOpenThreads
LIB_EXT = dylib LIB_EXT = dylib
QUICKTIME = -framework QuickTime $(CARBON_LIB) QUICKTIME = -framework QuickTime $(CARBON_LIB)
FREETYPE_INCLUDE = -I/sw/include/freetype2 FREETYPE_INCLUDE = -I/sw/include/freetype2
TIFF_LIB = -ltiff LIBXML2_INCLUDE = -I/sw/include/libxml2
TIFF_LIB = -ltiff
LIBVERSION = -current_version $(VERSION) \ LIBVERSION = -current_version $(VERSION) \
-compatibility_version \ -compatibility_version \
$(VERSION_MAJOR).$(VERSION_MINOR).0 $(VERSION_MAJOR).$(VERSION_MINOR).0

2
examples/slideshow3D/GNUmakefile
View File

@ -16,7 +16,7 @@ INSTFILES = \
EXEC = slideshow3D EXEC = slideshow3D
INC += $(X_INC) -I/usr/include/libxml2 INC += $(X_INC) $(LIBXML2_INCLUDE)
include $(TOPDIR)/Make/makerules include $(TOPDIR)/Make/makerules

2
examples/slideshow3D/GNUmakefile.inst
View File

@ -12,7 +12,7 @@ LIBS += -lxml2 -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(
EXEC = slideshow3D EXEC = slideshow3D
INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) -I/usr/include/libxml2 INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) $(LIBXML2_INCLUDE)
LDFLAGS += $(PRODUCER_LIB_DIR) LDFLAGS += $(PRODUCER_LIB_DIR)
include $(TOPDIR)/Make/makerules include $(TOPDIR)/Make/makerules