diff options
| author | Mark Charlebois <charlebm@gmail.com> | 2015-03-11 16:45:19 -0700 |
|---|---|---|
| committer | Mark Charlebois <charlebm@gmail.com> | 2015-04-20 11:00:16 -0700 |
| commit | 5084a61f0ed5ed0910d3067c927c2787ee69a574 (patch) | |
| tree | b12fe1acc98aa888fae641c139727257f79c7529 /makefiles | |
| parent | 89e1b454af22e67e559f0d7f99a81a826bf62bbc (diff) | |
| download | px4-firmware-5084a61f0ed5ed0910d3067c927c2787ee69a574.tar.gz px4-firmware-5084a61f0ed5ed0910d3067c927c2787ee69a574.tar.bz2 px4-firmware-5084a61f0ed5ed0910d3067c927c2787ee69a574.zip | |
Abstractions to compile systemlib for Linux and Nuttx
Modified uint32_t casts of pointers to unsigned long for portability.
It otherwise breaks on x86_64.
Added _PX4_IOC to handle the conflice between _IOC on Linux and NuttX.
Removed use of px4::ok() because it cannot be used in a thread based
implementation. Changed to use px4::AppMgr which uses ok() on ROS.
Removed up_cxxinitialize.c from Linux build.
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/linux/config_linux_default.mk | 2 | ||||
| -rw-r--r-- | makefiles/setup.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/makefiles/linux/config_linux_default.mk b/makefiles/linux/config_linux_default.mk index 172565b32..f0575db3f 100644 --- a/makefiles/linux/config_linux_default.mk +++ b/makefiles/linux/config_linux_default.mk @@ -37,7 +37,7 @@ # # Library modules # -#MODULES += modules/systemlib +MODULES += modules/systemlib #MODULES += modules/systemlib/mixer #MODULES += modules/uORB #MODULES += modules/dataman diff --git a/makefiles/setup.mk b/makefiles/setup.mk index fd4cbb1a7..1c6e5c3a2 100644 --- a/makefiles/setup.mk +++ b/makefiles/setup.mk @@ -33,8 +33,8 @@ # Path and tool setup # -#export PX4_TARGET_OS = nuttx -export PX4_TARGET_OS = linux +export PX4_TARGET_OS = nuttx +#export PX4_TARGET_OS = linux # # Some useful paths. |