Changeset 185 in tmcsimulator for branches/FEPSimulator/nbproject/Makefile-Debug.mk

Timestamp:

10/28/2017 06:07:50 PM (9 years ago)

Author:

jtorres

Message:

HighwaysTest?.java, LoadHighwaysTest?.java, LoadSadDotsTest?.java: configured Highways initialization to reflect new configuration, but the tests obviously still fail. branches/FEPSimulator: removed tinxml/ and unlinked the tinyxml library in project configuration

File:

• branches/FEPSimulator/nbproject/Makefile-Debug.mk (modified) (3 diffs)

branches/FEPSimulator/nbproject/Makefile-Debug.mk

@@ -38 +38 @@
         ${OBJECTDIR}/DataPacker.o \
         ${OBJECTDIR}/FEPSim.o \
+        ${OBJECTDIR}/HighwaysParser.o \
         ${OBJECTDIR}/Main.o \
-        ${OBJECTDIR}/NetworkReader.o \
         ${OBJECTDIR}/fep_clnt.o \
         ${OBJECTDIR}/fep_xdr.o
@@ -58 +58 @@
 
 # Link Libraries and Options
-LDLIBSOPTIONS=tinyxml/tinyxml.a
+LDLIBSOPTIONS=
 
 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
         "${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
-
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: tinyxml/tinyxml.a
 
 ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ${OBJECTFILES}
@@ -80 +78 @@
         $(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim.o FEPSim.cpp
 
+${OBJECTDIR}/HighwaysParser.o: HighwaysParser.cpp 
+        ${MKDIR} -p ${OBJECTDIR}
+        ${RM} "$@.d"
+        $(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HighwaysParser.o HighwaysParser.cpp
+
 ${OBJECTDIR}/Main.o: Main.cpp 
         ${MKDIR} -p ${OBJECTDIR}
         ${RM} "$@.d"
         $(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Main.o Main.cpp
-
-${OBJECTDIR}/NetworkReader.o: NetworkReader.cpp 
-        ${MKDIR} -p ${OBJECTDIR}
-        ${RM} "$@.d"
-        $(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/NetworkReader.o NetworkReader.cpp
 
 ${OBJECTDIR}/fep_clnt.o: fep_clnt.c