Skip to content
Snippets Groups Projects
Commit eba3a607 authored by ucart's avatar ucart
Browse files

fixing build issues

parent a577ce1f
No related branches found
No related tags found
1 merge request!43Resolve "Transition current hardware platform to Vivado"
......@@ -82,7 +82,7 @@ vrpn/build:
cd src/vrpn/build && cmake .. && make
GroundStation:
cd gui/MicroCART && qmake
cd gui/MicroCART && qmake-qt5
cd gui/MicroCART && make
ln -s gui/MicroCART/MicroCART GroundStation
......
QMAKE_CXX.INCDIRS = \
/usr/include/c++/4.8.5 \
/usr/include/c++/4.8.5/x86_64-redhat-linux \
/usr/include/c++/4.8.5/backward \
/usr/lib/gcc/x86_64-redhat-linux/4.8.5/include \
/usr/local/include \
/usr/include
QMAKE_CXX.LIBDIRS = \
/usr/lib/gcc/x86_64-redhat-linux/4.8.5 \
/usr/lib64 \
/lib64 \
/usr/lib \
/lib
QMAKE_CXX.QT_COMPILER_STDCXX = 199711L
QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 4
QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 8
QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 5
QMAKE_CXX.COMPILER_MACROS = \
QT_COMPILER_STDCXX \
QMAKE_GCC_MAJOR_VERSION \
QMAKE_GCC_MINOR_VERSION \
QMAKE_GCC_PATCH_VERSION
......@@ -51,9 +51,10 @@ enum MessageTypeID{
RESPOUTPUT_ID, // 14 - Responding with node output
GETNODES_ID, // 15 - Getting node IDs from current comp_graph
RESPNODES_ID, // 16 - Responding with node IDs from current comp_graph
ADDNODE_ID, // 17 - Add a node of specified type_id
RESPADDNODE_ID, // 18 - Responding with the block_id of the newly added node
MAX_TYPE_ID // 19 - Just used to keep track of the size. Must remain at the end
ADDNODE_ID, // 17 - Add a node of specified type_id
RESPADDNODE_ID, // 18 - Responding with the block_id of the newly added node
MAX_TYPE_ID, // 19 - Just used to keep track of the size. Must remain at the end
SEND_RT_ID // 20 - Real Time sensor data sent to groundstation
};
struct modular_structs;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment