Changeset 115 in tmcsimulator for branches/FEPSimulator


Ignore:
Timestamp:
10/14/2017 10:29:03 AM (9 years ago)
Author:
jtorres
Message:

back to workingFEPSim, conflict errors

Location:
branches/FEPSimulator
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/FEPSimulator/DataPacker.cpp

    r114 r115  
    3737 
    3838    return msg;  
    39     return msg; 
    4039} 
    4140 

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

    r98 r115  
    5858 
    5959# Link Libraries and Options 
    60 LDLIBSOPTIONS=tinyxml/tinyxml.a 
     60LDLIBSOPTIONS=tinyxml/libosxtinyxml.a 
    6161 
    6262# Build Targets 
    … …  
    6464        "${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator 
    6565 
    66 ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: tinyxml/tinyxml.a 
     66${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: tinyxml/libosxtinyxml.a 
    6767 
    6868${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ${OBJECTFILES} 

  • branches/FEPSimulator/nbproject/configurations.xml

    r98 r115  
    5353        <linkerTool> 
    5454          <linkerLibItems> 
    55             <linkerLibFileItem>tinyxml/tinyxml.a</linkerLibFileItem> 
     55            <linkerLibFileItem>tinyxml/libosxtinyxml.a</linkerLibFileItem> 
    5656          </linkerLibItems> 
    5757        </linkerTool> 

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

    r114 r115  
    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> 
     10            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.cpp</file> 
     11            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/Main.cpp</file> 
    1112            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/NetworkReader.cpp</file> 
    1213            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/DataPacker.cpp</file> 
    13             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.cpp</file> 
    14             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/Main.cpp</file> 
    1514            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/fep.h</file> 
    16             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.h</file> 
    1715        </group> 
    1816    </open-files> 
Note: See TracChangeset for help on using the changeset viewer.