Revision: 1693
http://complement.svn.sourceforge.net/complement/?rev=1693&view=rev
Author: complement
Date: 2007-08-17 08:22:41 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
fix build without STLport
Modified Paths:
--------------
trunk/complement/explore/lib/janus/ut/Makefile
Modified: trunk/complement/explore/lib/janus/ut/Makefile
===================================================================
--- trunk/complement/explore/lib/janus/ut/Makefile 2007-08-17 15:01:43 UTC (rev 1692)
+++ trunk/complement/explore/lib/janus/ut/Makefile 2007-08-17 15:22:41 UTC (rev 1693)
@@ -9,10 +9,15 @@
include ${SRCROOT}/Makefiles/gmake/top.mak
# DEFS += -DUNIT_TEST
-INCLUDES += -I${CoMT_INCLUDE_DIR} -I${BOOST_INCLUDE_DIR} -I..
+INCLUDES += -I${CoMT_INCLUDE_DIR} -I..
DEFS += -D__FIT_EXAM
-LDFLAGS += -L${INSTALL_LIB_DIR} -Wl,-rpath=${INSTALL_LIB_DIR}:${STLPORT_LIB_DIR}
+LDFLAGS += -L${INSTALL_LIB_DIR}
+ifdef WITHOUT_STLPORT
+LDFLAGS += -Wl,-rpath=${INSTALL_LIB_DIR}
+else
+LDFLAGS += -Wl,-rpath=${INSTALL_LIB_DIR}:${STLPORT_LIB_DIR}
+endif
release-shared: PROJECT_LIBS = -lxmt -lsockios -lstem -lexam
dbg-shared: PROJECT_LIBS = -lxmtg -lsockiosg -lstemg -lexamg
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
