CoRE Simulation Models for Real-time Networks

Changeset 24d2334 in SignalsAndGateways


Ignore:
Timestamp:
03/17/16 11:33:02 (3 years ago)
Author:
Till Steinbach <till.steinbach@…>
Branches:
master
Children:
af77a16
Parents:
551c4e5 (diff), a562ac8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'integration' into refactor/omnet50

Files:
1 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r551c4e5 r24d2334  
    1313CORE4INET_PROJ=../../CoRE4INET
    1414FICO4OMNET_PROJ=../../FiCo4OMNeT
    15 MAKEMAKE_OPTIONS := -f --deep --no-deep-includes -I. -I$(INET_PROJ)/src/ -I$(CORE4INET_PROJ)/src/ -I$(FICO4OMNET_PROJ)/src/ -DINET_IMPORT -L$(INET_PROJ)/out/$$\(CONFIGNAME\)/src -L$(CORE4INET_PROJ)/out/$$\(CONFIGNAME\)/src -L$(FICO4OMNET_PROJ)/out/$$\(CONFIGNAME\)/src -lCoRE4INET -lINET -lFiCo4OMNeT -KINET_PROJ=$(INET_PROJ) -KCORE4INET_PROJ=$(CORE4INET_PROJ) -KFICO4OMNET_PROJ=$(FICO4OMNET_PROJ)
     15MAKEMAKE_OPTIONS := -f --deep --no-deep-includes -I. -I$(INET_PROJ)/src/ -I$(CORE4INET_PROJ)/src/ -I$(FICO4OMNET_PROJ)/src/ -DINET_IMPORT -L$(INET_PROJ)/src -L$(CORE4INET_PROJ)/src -L$(FICO4OMNET_PROJ)/src -lCoRE4INET -lINET -lFiCo4OMNeT -KINET_PROJ=$(INET_PROJ) -KCORE4INET_PROJ=$(CORE4INET_PROJ) -KFICO4OMNET_PROJ=$(FICO4OMNET_PROJ)
    1616
    1717makefiles: src/signalsandgateways/features.h makefiles-so
  • src/makefrag

    r551c4e5 r24d2334  
    66# WARNINGS_ERROR=1
    77# for -Werror
     8
     9include dependencies_makefrag
    810
    911CFLAGS += -std=c++11
  • src/signalsandgateways/base/Dependencies.h

    r551c4e5 r24d2334  
    1919 * Check for minimal INET Version requirements
    2020 */
    21 #if INET_VERSION < 0x0301
    22 #  error At least INET version 3.1 required
     21#if INET_VERSION < 0x0302
     22#  error At least INET version 3.2 required
    2323#endif
    2424
Note: See TracChangeset for help on using the changeset viewer.