Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
elphel-apps-camogm
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
elphel-apps-camogm
Commits
e029dc0d
Commit
e029dc0d
authored
Aug 15, 2016
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed .gitignore
parent
5c022bde
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
17 deletions
+29
-17
.gitignore
.gitignore
+10
-6
Makefile
Makefile
+16
-8
camogm.h
camogm.h
+3
-3
No files found.
.gitignore
View file @
e029dc0d
html/*
html/*
.project
attic/*
.cproject
/.project
.externalToolBuilders
/.cproject
.settings
/.pydevproject
*.directory
/.externalToolBuilders
/.settings
.directory
generated*
sysroots
bitbake-logs
\ No newline at end of file
Makefile
View file @
e029dc0d
PROGS
=
camogm
PROGS
=
camogm
PHP
FILES
=
camogmstate.php
PHP
SCRIPTS
=
camogmstate.php
CONFIGS
=
qt_source
SRCS
=
camogm.c camogm_ogm.c camogm_jpeg.c camogm_mov.c camogm_kml.c camogm_read.c index_list.c
SRCS
=
camogm.c camogm_ogm.c camogm_jpeg.c camogm_mov.c camogm_kml.c camogm_read.c index_list.c
OBJS
=
camogm.o camogm_ogm.o camogm_jpeg.o camogm_mov.o camogm_kml.o camogm_read.o index_list.o
OBJS
=
camogm.o camogm_ogm.o camogm_jpeg.o camogm_mov.o camogm_kml.o camogm_read.o index_list.o
#OBJS = $(SRC:.c=.o)
#OBJS = $(SRC:.c=.o)
#CFLAGS += -Wall -I$(ELPHEL_KERNEL_DIR)/include/uapi/elphel
#CFLAGS += -Wall -I$(ELPHEL_KERNEL_DIR)/include/uapi/elphel
CFLAGS
+=
-Wall
-I
$(STAGING_DIR_HOST)
/usr/include-uapi
/elphel
CFLAGS
+=
-Wall
-I
$(STAGING_DIR_HOST)
/usr/include-uapi
LDLIBS
+=
-logg
-pthread
-lm
LDLIBS
+=
-logg
-pthread
-lm
INSTALL
=
install
INSTMODE
=
0755
INSTDOCS
=
0644
OWN
=
-o
root
-g
root
SYSCONFDIR
=
/etc/
SYSCONFDIR
=
/etc/
BINDIR
=
/usr/bin/
BINDIR
=
/usr/bin/
WWW_PAGES
=
/www/pages
WWW_PAGES
=
/www/pages
all
:
$(PROGS)
all
:
$(PROGS)
$(PROGS)
:
$(OBJS)
$(PROGS)
:
$(OBJS)
$(CC)
$(LDFLAGS)
$^
$(LDLIBS)
-o
$@
$(CC)
$(LDFLAGS)
$^
$(LDLIBS)
-o
$@
install
:
install
:
$(PROGS) $(PHPSCRIPTS) $(CONFIGS)
install
-d
$(DESTDIR)$(BINDIR)
$(INSTALL)
$(OWN)
-d
$(DESTDIR)$(BINDIR)
install
-m
0755
-t
$(DESTDIR)$(BINDIR)
$(PROGS)
$(INSTALL)
$(OWN)
-m
$(INSTMODE)
$(PROGS)
$(DESTDIR)$(BINDIR)
install
-d
$(DESTDIR)$(SYSCONFDIR)
$(INSTALL)
$(OWN)
-d
$(DESTDIR)$(SYSCONFDIR)
install
-m
0644
-t
$(DESTDIR)$(SYSCONFDIR)
$(CONFIGS)
$(INSTALL)
$(OWN)
-m
$(INSTDOCS)
$(CONFIGS)
$(DESTDIR)$(SYSCONFDIR)
$(INSTALL)
$(OWN)
-d
$(DESTDIR)$(WWW_PAGES)
$(INSTALL)
$(OWN)
-m
$(INSTMODE)
$(PHPSCRIPTS)
$(DESTDIR)$(WWW_PAGES)
clean
:
clean
:
rm
-rf
$(PROGS)
*
.o
*
~
rm
-rf
$(PROGS)
*
.o
*
~
...
...
camogm.h
View file @
e029dc0d
...
@@ -21,11 +21,11 @@
...
@@ -21,11 +21,11 @@
#include <pthread.h>
#include <pthread.h>
#include <stdbool.h>
#include <stdbool.h>
#include <exifa.h>
#include <c313a.h>
#include <ogg/ogg.h>
#include <ogg/ogg.h>
#include "ogmstreams.h"
#include "ogmstreams.h"
#include <x393_devices.h>
#include <elphel/exifa.h>
#include <elphel/c313a.h>
#include <elphel/x393_devices.h>
#define CAMOGM_FRAME_NOT_READY 1 ///< frame pointer valid, but not yet acquired
#define CAMOGM_FRAME_NOT_READY 1 ///< frame pointer valid, but not yet acquired
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment