diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-07 09:17:23 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-07 09:17:23 -0600 |
| commit | 14ba1f33ae8f55a3c7f556cf28647c7116b6c3c4 (patch) | |
| tree | 20444f1055f8c11f92fa29978ed0b2bd3a9559f6 /apps/system/nxplayer | |
| parent | fb7a08922178beb0cb053a00d1377366d4279e87 (diff) | |
| download | px4-nuttx-14ba1f33ae8f55a3c7f556cf28647c7116b6c3c4.tar.gz px4-nuttx-14ba1f33ae8f55a3c7f556cf28647c7116b6c3c4.tar.bz2 px4-nuttx-14ba1f33ae8f55a3c7f556cf28647c7116b6c3c4.zip | |
Changes to many Makefiles. For kernel buil object containing main cannot go into library because of name collisions. The object file must be handled as a special case in every Makefile
Diffstat (limited to 'apps/system/nxplayer')
| -rw-r--r-- | apps/system/nxplayer/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/system/nxplayer/Makefile b/apps/system/nxplayer/Makefile index d0f5de6ec..a5a473c93 100644 --- a/apps/system/nxplayer/Makefile +++ b/apps/system/nxplayer/Makefile @@ -54,8 +54,12 @@ APPNAME = nxplayer PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +ifeq ($(CONFIG_BUILD_KERNEL),y) +MAINSRC = nxplayer_main.c +else ifeq ($(CONFIG_NXPLAYER_COMMAND_LINE),y) -CSRCS += nxplayer_main.c +MAINSRC = nxplayer_main.c +endif endif AOBJS = $(ASRCS:.S=$(OBJEXT)) |