Changeset 185 in tmcsimulator for branches


Ignore:
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

Location:
branches/FEPSimulator
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • branches/FEPSimulator/nbproject/Makefile-Debug.mk

    r174 r185  
    3838        ${OBJECTDIR}/DataPacker.o \ 
    3939        ${OBJECTDIR}/FEPSim.o \ 
     40        ${OBJECTDIR}/HighwaysParser.o \ 
    4041        ${OBJECTDIR}/Main.o \ 
    41         ${OBJECTDIR}/NetworkReader.o \ 
    4242        ${OBJECTDIR}/fep_clnt.o \ 
    4343        ${OBJECTDIR}/fep_xdr.o 
    … …  
    5858 
    5959# Link Libraries and Options 
    60 LDLIBSOPTIONS=tinyxml/tinyxml.a 
     60LDLIBSOPTIONS= 
    6161 
    6262# Build Targets 
    6363.build-conf: ${BUILD_SUBPROJECTS} 
    6464        "${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator 
    65  
    66 ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: tinyxml/tinyxml.a 
    6765 
    6866${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ${OBJECTFILES} 
    … …  
    8078        $(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim.o FEPSim.cpp 
    8179 
     80${OBJECTDIR}/HighwaysParser.o: HighwaysParser.cpp  
     81        ${MKDIR} -p ${OBJECTDIR} 
     82        ${RM} "$@.d" 
     83        $(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HighwaysParser.o HighwaysParser.cpp 
     84 
    8285${OBJECTDIR}/Main.o: Main.cpp  
    8386        ${MKDIR} -p ${OBJECTDIR} 
    8487        ${RM} "$@.d" 
    8588        $(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Main.o Main.cpp 
    86  
    87 ${OBJECTDIR}/NetworkReader.o: NetworkReader.cpp  
    88         ${MKDIR} -p ${OBJECTDIR} 
    89         ${RM} "$@.d" 
    90         $(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/NetworkReader.o NetworkReader.cpp 
    9189 
    9290${OBJECTDIR}/fep_clnt.o: fep_clnt.c  

  • branches/FEPSimulator/nbproject/configurations.xml

    r174 r185  
    2020      <itemPath>DataPacker.cpp</itemPath> 
    2121      <itemPath>FEPSim.cpp</itemPath> 
     22      <itemPath>HighwaysParser.cpp</itemPath> 
    2223      <itemPath>Main.cpp</itemPath> 
    23       <itemPath>NetworkReader.cpp</itemPath> 
    2424      <itemPath>fep_clnt.c</itemPath> 
    2525      <itemPath>fep_xdr.c</itemPath> 
    … …  
    5151          </incDir> 
    5252        </ccTool> 
    53         <linkerTool> 
    54           <linkerLibItems> 
    55             <linkerLibFileItem>tinyxml/tinyxml.a</linkerLibFileItem> 
    56           </linkerLibItems> 
    57         </linkerTool> 
    5853      </compileType> 
    5954      <item path="DataPacker.cpp" ex="false" tool="1" flavor2="0"> 
    … …  
    6560      <item path="FEPSim.h" ex="false" tool="3" flavor2="0"> 
    6661      </item> 
     62      <item path="HighwaysParser.cpp" ex="false" tool="1" flavor2="0"> 
     63      </item> 
    6764      <item path="Main.cpp" ex="false" tool="1" flavor2="0"> 
    68       </item> 
    69       <item path="NetworkReader.cpp" ex="false" tool="1" flavor2="0"> 
    7065      </item> 
    7166      <item path="NetworkReader.h" ex="false" tool="3" flavor2="0"> 
    … …  
    108103      <item path="FEPSim.h" ex="false" tool="3" flavor2="0"> 
    109104      </item> 
     105      <item path="HighwaysParser.cpp" ex="false" tool="1" flavor2="0"> 
     106      </item> 
    110107      <item path="Main.cpp" ex="false" tool="1" flavor2="0"> 
    111       </item> 
    112       <item path="NetworkReader.cpp" ex="false" tool="1" flavor2="0"> 
    113108      </item> 
    114109      <item path="NetworkReader.h" ex="false" tool="3" flavor2="0"> 

  • branches/FEPSimulator/nbproject/private/private.xml

    r184 r185  
    88    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2"> 
    99        <group> 
    10             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/network.h</file> 
    11             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/NetworkReader.cpp</file> 
    12             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/DataPacker.cpp</file> 
    1310            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.cpp</file> 
    14             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/fep.h</file> 
    15             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.h</file> 
    1611        </group> 
    1712    </open-files> 
Note: See TracChangeset for help on using the changeset viewer.