Skip to content

Commit

Permalink
0.0.3 - Changed build system. Now libvpx is built outside with optimi…
Browse files Browse the repository at this point in the history
…zations.
  • Loading branch information
soywiz committed Nov 14, 2012
1 parent 40cd970 commit 02bbe74
Show file tree
Hide file tree
Showing 12 changed files with 53 additions and 524 deletions.
8 changes: 8 additions & 0 deletions changelog.txt
@@ -0,0 +1,8 @@
0.0.3
Changed build system. Now libvpx is built outside with optimizations.

0.0.2
Audio support and fixes

0.0.1
First release
5 changes: 5 additions & 0 deletions clean.bat
@@ -0,0 +1,5 @@
@echo off
rd /S /Q project\obj 2> NUL
del /Q project\all_objs 2> NUL
del /Q project\vc110.pdb 2> NUL
rd /S /Q ndll\Windows 2> NUL
2 changes: 1 addition & 1 deletion haxelib.xml
Expand Up @@ -10,7 +10,7 @@
<tag v="video"/>
<tag v="formats"/>
<description>NME haxe extensions for decoding webm videos (mkv+vp8+vorbis).</description>
<version name="0.0.1">First release</version>
<version name="0.0.3">Changed build system. Now libvpx is built outside with optimizations.</version>
<depends name="nme"/>
<depends name="hxcpp"/>
</project>
Binary file added libs/Windows/vpx.lib
Binary file not shown.
34 changes: 34 additions & 0 deletions libs/build_windows_msys.sh
@@ -0,0 +1,34 @@
pushd ../project/libogg

## LIBOGG
#cd ../libogg && \
#./configure && \
#make clean && \
#make && \
#make install && \
#cp ./src/.libs/libogg.a ../../libs/Windows/ogg.lib && \
#
## LIBVORBIS
#cd ../libvorbis
#./configure --with-ogg=/local --disable-oggtest --disable-examples --disable-docs && \
#make clean && \
#make && \
#make install && \
#cp ./lib/.libs/libvorbis.a ../../libs/Windows/vorbis.lib && \
#
## LIBWEBM
#cd ../libwebm && \
#./configure && \
#make clean && \
#make && \
#cp ./libwebm.a ../../libs/Windows/webm.lib && \

# LIBVPX
cd ../libvpx && \
./configure --disable-examples --disable-docs --disable-unit-tests --disable-vp8-encoder && \
make clean && \
make && \
make install && \
cp ./libvpx.a ../../libs/Windows/vpx.lib && \

popd
Binary file modified ndll/Windows/nme-webm.ndll
Binary file not shown.
56 changes: 4 additions & 52 deletions project/Build.xml
Expand Up @@ -19,13 +19,8 @@
<set name="name_extra" value=".iphoneos${IOS_ARCH}" if="iphoneos"/>

<set name="name_extra" value="-x86" if="simulator" unless="iphonesim" />

<set name="name_prefix" value="lib" if="iphone" />

<set name="sse2" value="1" if="windows" />
<set name="sse2" value="1" if="linux" />
<set name="sse2" value="1" if="mac" />

<files id="common">

<depend name="${HXCPP}/include/hx/Macros.h"/>
Expand Down Expand Up @@ -79,52 +74,6 @@
<file name="libvorbis/lib/psytune.c" />
-->

<file name="libvpx/vpx/src/vpx_decoder.c" />
<file name="libvpx/vpx/src/vpx_encoder.c" />
<file name="libvpx/vpx/src/vpx_codec.c" />
<file name="libvpx/vpx/src/vpx_image.c" />
<file name="libvpx/vpx_mem/vpx_mem.c" />
<file name="libvpx/vpx_scale/generic/vpxscale.c" />
<file name="libvpx/vpx_scale/generic/yv12config.c" />
<file name="libvpx/vpx_scale/generic/yv12extend.c" />
<file name="libvpx/vpx_scale/generic/gen_scalers.c" />
<file name="libvpx/vp8/common/alloccommon.c" />
<file name="libvpx/vp8/common/asm_com_offsets.c" />
<file name="libvpx/vp8/common/blockd.c" />
<file name="libvpx/vp8/common/debugmodes.c" />
<file name="libvpx/vp8/common/dequantize.c" />
<file name="libvpx/vp8/common/entropy.c" />
<file name="libvpx/vp8/common/entropymode.c" />
<file name="libvpx/vp8/common/entropymv.c" />
<file name="libvpx/vp8/common/extend.c" />
<file name="libvpx/vp8/common/filter.c" />
<file name="libvpx/vp8/common/findnearmv.c" />
<file name="libvpx/vp8/common/generic/systemdependent.c" />
<file name="libvpx/vp8/common/idct_blk.c" />
<file name="libvpx/vp8/common/idctllm.c" />
<file name="libvpx/vp8/common/rtcd.c" />
<file name="libvpx/vp8/common/loopfilter.c" />
<file name="libvpx/vp8/common/loopfilter_filters.c" />
<file name="libvpx/vp8/common/mbpitch.c" />
<file name="libvpx/vp8/common/modecont.c" />
<file name="libvpx/vp8/common/quant_common.c" />
<file name="libvpx/vp8/common/reconinter.c" />
<file name="libvpx/vp8/common/reconintra.c" />
<file name="libvpx/vp8/common/reconintra4x4.c" />
<file name="libvpx/vp8/common/sad_c.c" />
<file name="libvpx/vp8/common/setupintrarecon.c" />
<file name="libvpx/vp8/common/swapyv12buffer.c" />
<file name="libvpx/vp8/common/variance_c.c" />
<file name="libvpx/vp8/common/treecoder.c" />
<file name="libvpx/vp8/vp8_dx_iface.c" />
<file name="libvpx/vp8/decoder/asm_dec_offsets.c" />
<file name="libvpx/vp8/decoder/dboolhuff.c" />
<file name="libvpx/vp8/decoder/decodemv.c" />
<file name="libvpx/vp8/decoder/decodframe.c" />
<file name="libvpx/vp8/decoder/detokenize.c" />
<file name="libvpx/vp8/decoder/onyxd_if.c" />
<file name="libvpx/vpx_config.c" />

</files>

<files id="windows">
Expand All @@ -133,8 +82,11 @@
<target id="NDLL" output="${name_prefix}nme-webm${name_extra}" tool="linker" toolid="${ndll-tool}">
<outdir name="../ndll/${BINDIR}" />
<ext value=".ndll" unless="mobile"/>
<files id="common" />
<files id="common" />
<files id="windows" if="windows"/>

<flag value="-libpath:../libs/Windows" if="windows"/>
<lib name="vpx.lib" if="windows"/>
</target>

<target id="default">
Expand Down
9 changes: 0 additions & 9 deletions project/libvpx/vpx_config.c

This file was deleted.

80 changes: 0 additions & 80 deletions project/libvpx/vpx_config.h

This file was deleted.

0 comments on commit 02bbe74

Please sign in to comment.