Statistics
| Branch: | Revision:

streamers / Makefile @ 145763e2

History | View | Annotate | Download (5.24 KB)

# Date Author Comment
145763e2 05/02/2011 04:56 PM Csaba Kiraly

link to valib if present and needed (might be required by ffmpeg)

e8338957 02/16/2011 11:43 PM Csaba Kiraly

Merge branch 'x264'

b3cd616d 02/16/2011 11:42 PM Csaba Kiraly

adding x264 support to Makefile

8fde809b 02/16/2011 09:21 PM Csaba Kiraly

Merge branches 'merge-wine', 'fixes3', 'monl' and 'httpio' into merge-wine-0.9.9

cbd3919d 02/16/2011 05:45 PM Csaba Kiraly

changing name to streamer

d662c7ff 02/16/2011 04:49 PM GiuseppeTropea

modify to Streamer Makefile by UL components for windows compilation: removed the definitions of LOCAL_CURL and LOCAL_MHD folders from inside the Makefile. It receives them from the external build_ul script, since they are different for linux and windows compilation...

1494311a 02/16/2011 03:51 PM Csaba Kiraly

fix: make it link both to installed and to non-installed ffmpeg versions

8781f611 02/16/2011 03:47 PM Csaba Kiraly

Merge remote branch 'svn/branches/Streamer/winestreamer-0.9' into merge-wine

Conflicts:
Chunkiser/input-stream-avs.c
streamer.c
streaming.c
topology.c

feaa6e2c 02/15/2011 12:37 PM Luca Abeni

Remove some code that has been moved in GRAPES

23748bc9 02/10/2011 07:16 AM Luca Abeni

Do not strictly require ffmpeg for compiling grapes IO

327fc1a6 02/08/2011 07:42 AM Luca Abeni

GRAPES IO, first draft

7c933932 02/01/2011 09:28 AM Csaba Kiraly

adding transition folder to Makefile

58e0316a 10/15/2010 02:57 PM Csaba Kiraly

renaming OfferStreamer folder to Streamer

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/branches/winestreamer-0.9/Applications/Streamer@2297 c54fac2e-1815-407e-9b96-088d06743913

f6d22873 10/13/2010 01:40 PM Csaba Kiraly

compile gprof mode without optimizations

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/branches/winestreamer-0.9/Applications/OfferStreamer@2256 c54fac2e-1815-407e-9b96-088d06743913

8a49328f 10/09/2010 12:42 PM Csaba Kiraly

r2142 has been selected as the baseline for release 0.9.x

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/branches/winestreamer-0.9/Applications/OfferStreamer@2232 c54fac2e-1815-407e-9b96-088d06743913

71b13457 09/28/2010 01:06 AM Csaba Kiraly

compile gprof mode without optimizations

d2c7b084 09/03/2010 06:34 PM MarcoBiazzini

adding half-static linking to the Makefile

STATIC=0: dynamic linking, the default (remains the same)
STATIC=1: halfstatic linking
STATIC=2: equivalent to previous static linking

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@2104 c54fac2e-1815-407e-9b96-088d06743913

9a366263 09/03/2010 06:32 PM MarcoBiazzini

removing some commented lines from the Makefile

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@2103 c54fac2e-1815-407e-9b96-088d06743913

8612d586 08/25/2010 02:01 PM Csaba Kiraly

temporary commit to make statistics happen with HTTP I/O

this is only a temporary commit for the demo, should be cleaned later on!

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@2085 c54fac2e-1815-407e-9b96-088d06743913

487fe1b5 08/18/2010 05:22 PM Csaba Kiraly

fix: add -lz to ALTO

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@2060 c54fac2e-1815-407e-9b96-088d06743913

ea5857ec 08/18/2010 03:59 PM Csaba Kiraly

fix pthread handling in Makefile

there was a mixed use of -lpthread and -pthread, which is wrong

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@2059 c54fac2e-1815-407e-9b96-088d06743913

4815b48c 08/18/2010 10:00 AM Csaba Kiraly

fix linking with libxml2

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@2054 c54fac2e-1815-407e-9b96-088d06743913

b27e5c1b 08/18/2010 08:58 AM MarcoBiazzini

Offerstreamer/Makefile : mods to compile with ALTO if flag is defined

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@2046 c54fac2e-1815-407e-9b96-088d06743913

4c6cd5d3 08/17/2010 07:53 PM Csaba Kiraly

removing half-dynamic-half-static linking

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@2038 c54fac2e-1815-407e-9b96-088d06743913

c0014e78 08/15/2010 04:56 PM Csaba Kiraly

fixed makefile: httpevent I/O module requires dclog

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@2019 c54fac2e-1815-407e-9b96-088d06743913

5805c339 08/04/2010 08:47 PM GiuseppeTropea

UL offerstreamer integration
- introduced two variants of http server: EVENT based and MHD libmicrohttpd (threads) based
- consequently modified and expanded Makefile

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1918 c54fac2e-1815-407e-9b96-088d06743913

85e3443f 08/02/2010 04:40 PM GiuseppeTropea

added an THREADS define symbol which is useful for http version of offerstreamer

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1884 c54fac2e-1815-407e-9b96-088d06743913

c7a8be3d 07/27/2010 01:54 PM Csaba Kiraly

add -debug suffix to debug versions

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1809 c54fac2e-1815-407e-9b96-088d06743913

d6e5cee8 07/27/2010 08:39 AM Csaba Kiraly

changing to the new GRAPES structure

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1790 c54fac2e-1815-407e-9b96-088d06743913

5c050682 07/25/2010 08:27 PM Csaba Kiraly

adding UDP IO

activate with IO=udp

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1726 c54fac2e-1815-407e-9b96-088d06743913

6d85fd9d 07/25/2010 08:26 PM Csaba Kiraly

adding the IO option to makefile

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1716 c54fac2e-1815-407e-9b96-088d06743913

7d6491b0 07/25/2010 08:26 PM Csaba Kiraly

adding libpthread because of ffmpeg

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1713 c54fac2e-1815-407e-9b96-088d06743913

a5a8f021 07/25/2010 08:26 PM Csaba Kiraly

added GPROF make option

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1712 c54fac2e-1815-407e-9b96-088d06743913

c3b092a0 07/22/2010 10:00 AM Csaba Kiraly

fixing linking with c and with c++

LD is set by default to ld, which is not the correct linker to use. We
need to link with CC or with g++ depending on whether there are c++ modules

Conflicts:

Makefile

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1678 c54fac2e-1815-407e-9b96-088d06743913

018af19b 07/20/2010 02:57 PM TivadarSzemethy

fixing build.sh problems

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1665 c54fac2e-1815-407e-9b96-088d06743913

8c722c6d 07/17/2010 11:40 PM Csaba Kiraly

fix streamer makefile to do only the linking with g++

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1588 c54fac2e-1815-407e-9b96-088d06743913

74a5d4ae 07/17/2010 11:39 PM Csaba Kiraly

Revert "Changed to build both with cc and g++"

This reverts commit 7ed27fb098c874145c4210155330b206e97ee8aa.

Conflicts:

Applications/OfferStreamer/Makefile

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1585 c54fac2e-1815-407e-9b96-088d06743913

37203792 07/16/2010 05:13 PM GiuseppeTropea

UL integration: fixed offerstreamer Makefile in the HTTPIO part to reflect some changes in UL components build process

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1583 c54fac2e-1815-407e-9b96-088d06743913

03dca3bf 07/14/2010 02:55 PM ArpadBakay

UL Build changes by Giuseppe/Arpad

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1549 c54fac2e-1815-407e-9b96-088d06743913

ada339a0 07/13/2010 02:16 PM ArpadBakay

Undoing changes by Guiseppe

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1548 c54fac2e-1815-407e-9b96-088d06743913

46df1492 07/13/2010 01:41 PM GiuseppeTropea

removed large video files

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1547 c54fac2e-1815-407e-9b96-088d06743913

913146ae 07/12/2010 12:41 PM ArpadBakay

Allow separate static linking for libevent

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1543 c54fac2e-1815-407e-9b96-088d06743913

23442a5b 07/10/2010 11:57 PM ArpadBakay

Changed to build both with cc and g++

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1535 c54fac2e-1815-407e-9b96-088d06743913

29b5c4a8 07/08/2010 09:59 PM MarcoMellia

forced libevent to be statically linked

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1518 c54fac2e-1815-407e-9b96-088d06743913

a2d8e810 07/01/2010 02:14 PM ArpadBakay

Fixes for build_all.sh and for offerstreamer Makefile

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1507 c54fac2e-1815-407e-9b96-088d06743913

89adc95a 07/01/2010 09:06 AM ArpadBakay

New directory structure + build-all.sh that builds the OfferStreamer

git-svn-id: https://repository.napa-wine.eu/svn/napawine-software/trunk/Applications/OfferStreamer@1506 c54fac2e-1815-407e-9b96-088d06743913

473a00b3 06/17/2010 11:18 AM Csaba Kiraly

separating MONL better: adding measures.c for MONLless versions

9c4f8e7e 06/17/2010 11:17 AM Csaba Kiraly

separating MONL better: changing measures.c to measures-monl.c

6e052cb8 06/16/2010 11:32 PM Csaba Kiraly

fixing ml.h 's include directory

0e66f272 05/20/2010 03:05 PM Csaba Kiraly

upgrade references to GRAPES/som to GRAPES

0e7105fe 05/17/2010 05:15 PM Csaba Kiraly

fix clean in Makefile

one .o file was not removed

581339c4 05/06/2010 09:57 PM Csaba Kiraly

adding -C parameter to set channel name

18b3d383 05/06/2010 09:56 PM Csaba Kiraly

add monl to the executable name to differentiate versions

3ceb4247 05/06/2010 09:56 PM Csaba Kiraly

adding one more dependence (lrt) for the sake of libevent 2.0.3+

a537d172 04/29/2010 04:14 PM Csaba Kiraly

new makefile that separates external dependencies to GRAPES and NAPA

This new makefile allows us to separate different libraries,
linking with version A of one, and version B of another. Previously
they were imported all together, introducing too much cross-dependencies.

b58cb76a 04/16/2010 08:33 AM Csaba Kiraly

improved debug output

f5783ec4 04/09/2010 08:34 AM Csaba Kiraly

ugly fix to compile static with MONL

caefd3c9 04/09/2010 08:34 AM Csaba Kiraly

move linking of eventlib to the end in the makefile

a874d5ac 04/09/2010 08:34 AM Csaba Kiraly

adding MONL support in Makefile

8cc2c49a 04/09/2010 08:33 AM Csaba Kiraly

Merge branch 'RockStreamer' into OfferStreamer

b43fb02a 04/09/2010 07:06 AM Csaba Kiraly

Merge branch 'DumbStreamer' into RockStreamer

7618c9ab 04/09/2010 07:01 AM Csaba Kiraly

clean removes net_helper as well

1435546b 04/09/2010 07:01 AM Csaba Kiraly

remove dependence on ml_helpers

33aea5f5 03/30/2010 10:11 PM Csaba Kiraly

Merge branch 'RockStreamer' into OfferStreamer

4ae5a3e9 03/30/2010 10:11 PM Csaba Kiraly

Merge branch 'DumbStreamer' into RockStreamer

be894e4d 03/30/2010 09:51 PM Luca Abeni

Rename the dummy output module

c4983616 03/30/2010 09:17 AM Csaba Kiraly

Merge branch 'RockStreamer' into OfferStreamer

3a1f076c 03/30/2010 09:17 AM Csaba Kiraly

Merge branch 'DumbStreamer' into RockStreamer

Conflicts:
loop-mt.c
loop.c

d67ef29a 03/30/2010 09:13 AM Csaba Kiraly

update GRAPES

c2b157e7 03/26/2010 09:39 AM Csaba Kiraly

Merge branch 'RockStreamer' into OfferStreamer

b3b1299e 03/26/2010 09:39 AM Csaba Kiraly

Merge branch 'DumbStreamer' into RockStreamer

fc637fed 03/26/2010 09:39 AM Csaba Kiraly

updated GRAPES to 0.8.2

0393e54c 03/24/2010 03:20 PM Csaba Kiraly

Merge branch 'RockStreamer' into OfferStreamer

54500884 03/24/2010 03:16 PM Csaba Kiraly

Merge branch 'DumbStreamer' into RockStreamer

fc342f90 03/24/2010 03:15 PM Csaba Kiraly

GRAPES upgrade to 0.8.1

5bc2469e 03/19/2010 04:23 PM Csaba Kiraly

Merge branch 'RockStreamer' into OfferStreamer

Conflicts:
Makefile

7d624a77 03/19/2010 04:22 PM Csaba Kiraly

Merge branch 'DumbStreamer' into RockStreamer

Conflicts:
Makefile

3076a802 03/19/2010 04:20 PM Csaba Kiraly

upgraded GRAPES to newest version

8e14c74c 03/19/2010 04:06 PM Csaba Kiraly

makefile changed for easier merge

51dbf323 03/19/2010 04:03 PM Csaba Kiraly

Merge branch 'DumbStreamer-IO2' into DumbStreamer

Conflicts:
out-stream.c

7c7bb98b 03/19/2010 08:12 AM Csaba Kiraly

Merge branch 'RockStreamer' into OfferStreamer

Conflicts:
loop.c

a8dd4c42 03/19/2010 08:00 AM Csaba Kiraly

Merge branch 'DumbStreamer' into RockStreamer

Conflicts:
loop-mt.c

6bcb761d 03/18/2010 03:27 PM Csaba Kiraly

differentiate threaded version in executable name

30686299 03/15/2010 11:50 PM Csaba Kiraly

Merge remote branch 'abeni/io_consolidation' into DumbStreamer

Conflicts:
Makefile

d74bb0e5 03/15/2010 02:42 PM Luca Abeni

First shot at a libav-based output module

b14ec756 03/13/2010 07:35 PM Csaba Kiraly

Merge branch 'RockStreamer' into OfferStreamer

0d6547a4 03/13/2010 07:35 PM Csaba Kiraly

Merge branch 'DumbStreamer' into RockStreamer

9aa083be 03/13/2010 07:33 PM Csaba Kiraly

upgrade GRAPES ref

984f5a9b 03/13/2010 09:45 AM Csaba Kiraly

force link creation in makefile

06cae981 03/11/2010 03:49 PM Csaba Kiraly

Merge branch 'RockStreamer' into OfferStreamer

557f9297 03/11/2010 03:06 PM Csaba Kiraly

Merge branch 'DumbStreamer' into RockStreamer

e1069ecc 03/11/2010 10:07 AM Csaba Kiraly

update GRAPES version

1e879f6b 03/11/2010 09:41 AM Csaba Kiraly

remove dclog dependence

19571fef 03/10/2010 10:37 AM Csaba Kiraly

Merge branch 'RockStreamer' into OfferStreamer

4e49f1c5 03/10/2010 10:37 AM Csaba Kiraly

Merge branch 'DumbStreamer' into RockStreamer

f7c16b43 03/10/2010 10:36 AM Csaba Kiraly

updated GRAPES revision

549b69d9 03/09/2010 03:13 PM Csaba Kiraly

Merge branch 'RockStreamer' into OfferStreamer

eff16202 03/09/2010 11:14 AM Csaba Kiraly

Merge branch 'DumbStreamer' into RockStreamer

b36d3310 03/09/2010 09:54 AM Csaba Kiraly

Makefile: added RELEASE tag

9eb35f54 03/08/2010 10:53 AM Csaba Kiraly

renaming target executable to offerstreamer