Преглед на файлове

add thirpartylib/FastRTPS/lib/libarm64.zip

yuchuli преди 3 години
родител
ревизия
1805adbe50
променени са 3 файла, в които са добавени 4 реда и са изтрити 3 реда
  1. 2 1
      include/common.pri
  2. 2 2
      src/common/modulecomm/modulecomm.pro
  3. BIN
      thirdpartylib/FastRTPS/lib/libarm64.zip

+ 2 - 1
include/common.pri

@@ -7,7 +7,8 @@ if(contains(DEFINES,RUNSYSTEMTEST)){
 unix:system("./linuxsystemtest.sh ")
 }
 
-include(systemdef.pri)
+unix:include(systemdef.pri)
+win32: DEFINES += SYSTEM_WIN
 
 INCLUDEPATH += $$PWD/../include/
 LIBS += -L$$PWD/../bin/ -lxmlparam -lmodulecomm  -livlog -livfault -livexit -livbacktrace -livchart

+ 2 - 2
src/common/modulecomm/modulecomm.pro

@@ -6,7 +6,7 @@ QT += xml
 TEMPLATE = lib
 DEFINES += MODULECOMM_LIBRARY
 
-#unix:DEFINES += USE_FASTRTPS
+unix:DEFINES += USE_FASTRTPS
 DEFINES += USEDBUS
 
 CONFIG += c++11
@@ -63,6 +63,6 @@ INCLUDEPATH += $$PWD/inter
 
 
 if(contains(DEFINES,USE_FASTRTPS)){
-LIBS += -L$$PWD -lfastcdr -lfastrtps
+LIBS +=  -lfastcdr -lfastrtps
 }
 

BIN
thirdpartylib/FastRTPS/lib/libarm64.zip