Index: branches/WorkingFEPSim/nbproject/Makefile-Debug.mk
===================================================================
--- branches/WorkingFEPSim/nbproject/Makefile-Debug.mk	(revision 115)
+++ branches/WorkingFEPSim/nbproject/Makefile-Debug.mk	(revision 116)
@@ -58,15 +58,15 @@
 
 # Link Libraries and Options
-LDLIBSOPTIONS=../../tmcsimulator/branches/FEPSimulator/tinyxml/libosxtinyxml.a
+LDLIBSOPTIONS=tinyxml/tinyxml.a
 
 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
-	"${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
+	"${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/workingfepsim
 
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ../../tmcsimulator/branches/FEPSimulator/tinyxml/libosxtinyxml.a
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/workingfepsim: tinyxml/tinyxml.a
 
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ${OBJECTFILES}
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/workingfepsim: ${OBJECTFILES}
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
-	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator ${OBJECTFILES} ${LDLIBSOPTIONS}
+	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/workingfepsim ${OBJECTFILES} ${LDLIBSOPTIONS}
 
 ${OBJECTDIR}/DataPacker.o: DataPacker.cpp 
@@ -106,5 +106,5 @@
 .clean-conf: ${CLEAN_SUBPROJECTS}
 	${RM} -r ${CND_BUILDDIR}/${CND_CONF}
-	${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
+	${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/workingfepsim
 
 # Subprojects