Commit e9e14b70 authored by Mikhail Karpenko's avatar Mikhail Karpenko
Browse files

Merge branch 'index_ops' 

 Conflicts:
	camogm.c
parents 30c6257b 928c20e9

.cproject

0 → 100644
+64 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

	<storageModule moduleId="org.eclipse.cdt.core.settings">

		<cconfiguration id="0.531211255">

			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.531211255" moduleId="org.eclipse.cdt.core.settings" name="Default">

				<externalSettings/>

				<extensions>

					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

				</extensions>

			</storageModule>

			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

				<configuration buildProperties="" description="" id="0.531211255" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

					<folderInfo id="0.531211255." name="/" resourcePath="">

						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.471666557" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.471666557.433608340" name=""/>

							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1922841623" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.702004608" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

							<tool id="org.eclipse.cdt.build.core.settings.holder.1963286915" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.574933238" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

							</tool>

							<tool id="org.eclipse.cdt.build.core.settings.holder.1479459009" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.854106261" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

							</tool>

							<tool id="org.eclipse.cdt.build.core.settings.holder.910595191" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1738165492" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" useByScannerDiscovery="false" valueType="includePath">

									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/linux/source/include/elphel}&quot;"/>

									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/sysroots/elphel393/usr/include}&quot;"/>

									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/sysroots/elphel393/usr/include/ogg}&quot;"/>

									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/sysroots/elphel393-tcbootstrap/usr/include/linux}&quot;"/>

								</option>

								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1943978810" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

							</tool>

						</toolChain>

					</folderInfo>

				</configuration>

			</storageModule>

			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>

		</cconfiguration>

	</storageModule>

	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

		<project id="elphel-apps-camogm.null.1205722733" name="elphel-apps-camogm"/>

	</storageModule>

	<storageModule moduleId="scannerConfiguration">

		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

		<scannerConfigBuildInfo instanceId="0.1398780877">

			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

		</scannerConfigBuildInfo>

		<scannerConfigBuildInfo instanceId="0.531211255">

			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

		</scannerConfigBuildInfo>

	</storageModule>

	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

	<storageModule moduleId="refreshScope"/>

	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings">

		<doc-comment-owner id="org.eclipse.cdt.ui.doxygen">

			<path value=""/>

		</doc-comment-owner>

	</storageModule>

</cproject>

.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
html/*

.project

0 → 100644
+59 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<projectDescription>

	<name>camogm</name>

	<comment></comment>

	<projects>

	</projects>

	<buildSpec>

		<buildCommand>

			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>

			<triggers>clean,full,incremental,</triggers>

			<arguments>

			</arguments>

		</buildCommand>

		<buildCommand>

			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>

			<triggers>full,incremental,</triggers>

			<arguments>

				<dictionary>

					<key>LaunchConfigHandle</key>

					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder (1).launch</value>

				</dictionary>

			</arguments>

		</buildCommand>

		<buildCommand>

			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>

			<triggers>full,incremental,</triggers>

			<arguments>

				<dictionary>

					<key>LaunchConfigHandle</key>

					<value>&lt;project&gt;/.externalToolBuilders/bitbake apps-camogm -c fetch -f.launch</value>

				</dictionary>

				<dictionary>

					<key>incclean</key>

					<value>true</value>

				</dictionary>

			</arguments>

		</buildCommand>

		<buildCommand>

			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>

			<triggers>full,incremental,</triggers>

			<arguments>

				<dictionary>

					<key>LaunchConfigHandle</key>

					<value>&lt;project&gt;/.externalToolBuilders/bitbake apps-camogm -c compile -f.launch</value>

				</dictionary>

				<dictionary>

					<key>incclean</key>

					<value>true</value>

				</dictionary>

			</arguments>

		</buildCommand>

	</buildSpec>

	<natures>

		<nature>org.eclipse.cdt.core.cnature</nature>

		<nature>org.eclipse.cdt.core.ccnature</nature>

		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>

		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>

	</natures>

</projectDescription>

Doxyfile

0 → 100644
+2384 −0

File added.

Preview size limit exceeded, changes collapsed.

Makefile

+5 −29
Original line number Diff line number Diff line 
AXIS_USABLE_LIBS = UCLIBC GLIBC

AXIS_AUTO_DEPEND = yes

#include $(AXIS_TOP_DIR)/tools/build/Rules.axis



INSTDIR    = $(prefix)/usr/local/sbin/

OTHERDIR   = $(prefix)/usr/html/

PHPDIR     = $(prefix)/usr/html/

INSTMODE   = 0755

INSTOTHER  = 0644

INSTPHP    = 0644

INSTOWNER  = root

INSTGROUP  = root



INCDIR     = $(prefix)/include



PROGS      = camogm

PHPFILES   = camogmstate.php





SRCS = camogm.c camogm_ogm.c camogm_jpeg.c camogm_mov.c camogm_kml.c



OBJS = camogm.o camogm_ogm.o camogm_jpeg.o camogm_mov.o camogm_kml.o

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



CFLAGS   += -Wall -I$(ELPHEL_KERNEL_DIR)/include/elphel

#CFLAGS   += -Wall -I$(INCDIR) -I$(ELPHEL_KERNEL_DIR)/include/elphel

LDLIBS   += -logg -pthread -lm



all: $(PROGS)



$(PROGS): $(OBJS)

	$(CC) $(LDFLAGS) $^ $(LDLIBS) -logg  -o $@

install: $(PROGS)

	$(INSTALL) -d $(INSTDIR)

	$(INSTALL) -m $(INSTMODE) -o $(INSTOWNER) -g $(INSTGROUP) $(PROGS) $(INSTDIR)

#already installed with ccam.cgi

	$(INSTALL) -m $(INSTMODE) -o $(INSTOWNER) -g $(INSTGROUP) qt_source $(prefix)/etc

	$(INSTALL) -m $(INSTPHP)  -o $(INSTOWNER) -g $(INSTGROUP) $(PHPFILES) $(PHPDIR)

	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@



clean:

	rm -rf $(PROGS) *.o *~
 


configsubs: