From 321df2ba6b14705e5bcd110bea14fb9308270816 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Fri, 7 Jul 2017 20:59:50 +0200 Subject: [PATCH] fix OPAL-RT AsyncIP model for RT-LAB 11.1.x --- clients/opal/models/send_receive/Makefile.mk | 9 +++++++-- clients/opal/models/send_receive/send_receive.llm | 6 ------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/clients/opal/models/send_receive/Makefile.mk b/clients/opal/models/send_receive/Makefile.mk index 3097e25c8..ebce763ae 100644 --- a/clients/opal/models/send_receive/Makefile.mk +++ b/clients/opal/models/send_receive/Makefile.mk @@ -49,8 +49,13 @@ endif TARGET_LIB = -lpthread -lm -ldl -lutil -lrt $(INTEL_LIBS) -INCLUDES = -I. $(OPAL_INCPATH) -Iinclude -LIBPATH = -L. $(OPAL_LIBPATH) +LIBPATH = -L. $(OPAL_LIBPATH) +INCLUDES = -I. -Iinclude $(OPAL_INCPATH) + +ifneq ($(RTLAB_ROOT),) + INCLUDES += -I$(RTLAB_ROOT)/common/include_target +endif + CC_OPTS = -m32 -std=c99 -D_GNU_SOURCE -MMD LD_OPTS = -m32 OBJS = main.o msg.o utils.o socket.o $(INTEL_OBJS) diff --git a/clients/opal/models/send_receive/send_receive.llm b/clients/opal/models/send_receive/send_receive.llm index fe735aa7f..259960a76 100644 --- a/clients/opal/models/send_receive/send_receive.llm +++ b/clients/opal/models/send_receive/send_receive.llm @@ -36,8 +36,6 @@ WATCHDOG_TIMEOUT=5000 INTERNAL_IGN_SOURCE_FILE=sfun_gen_async_ctrl.c sfun_recv_async.c sfun_send_async.c INTERNAL_LIBRARY2=-lOpalAsyncApiR2014b INTERNAL_LIBRARY3=-lOpalAsyncApiCore -[ExtraGetFilesComp_1_RT_LAB] -AsyncIP=Binary|Async_Proc [ExtraPutFilesComp] Makefile.mk=Ascii include\config.h=Ascii @@ -50,10 +48,6 @@ src\main.c=Ascii src\msg.c=Ascii src\socket.c=Ascii src\utils.c=Ascii -[ExtraPutFilesComp_1_RT_LAB] -C:\OPAL-RT\RT-LAB\v11.0.8.13\common\lib\redhawk\libOpalAsyncApiCore.a=Binary|Other -[ExtraPutFilesLoad_1_RT_LAB] -.\send_receive_sm_model\OpREDHAWKtarget\AsyncIP=Binary|Async_Proc [General] ATT_CHECKSUM1=2360032266 ATT_CHECKSUM2=1041833943