[libdumb] 02/06: Merge branch 'upstream'
Tobias Hansen
thansen at moszumanska.debian.org
Sun Sep 3 15:31:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository libdumb.
commit ea4d711dcafc965a31bcc143f0216e80bd1f4978
Merge: a3db7d6 29a295a
Author: Tobias Hansen <thansen at debian.org>
Date: Sat Sep 2 23:55:20 2017 +0100
Merge branch 'upstream'
.gitattributes | 21 +
.gitignore | 44 +
CMakeLists.txt | 191 ++
COMPILING.md | 33 +
Makefile | 364 ----
Makefile.rdy | 364 ----
cmake-scripts/FindAllegro4.cmake | 41 +
cmake-scripts/FindSDL2.cmake | 42 +
cmake-scripts/Findargtable2.cmake | 27 +
docs/deprec.txt | 311 ----
docs/dumb.txt | 1839 -------------------
docs/faq.txt | 286 ---
docs/fnptr.txt | 111 --
docs/howto.txt | 864 ---------
docs/modplug.txt | 155 --
docs/ptr.txt | 127 --
examples/dumb.ini | 44 -
examples/dumb2wav.c | 435 -----
examples/dumbout.c | 646 +++----
examples/dumbplay.c | 626 +++----
include/dumb.h | 279 ++-
include/internal/aldumb.h | 15 +-
include/internal/barray.h | 43 +
include/internal/dumbfile.h | 13 +
include/internal/fir_resampler.h | 18 +
include/internal/it.h | 231 ++-
include/internal/lpc.h | 24 +
include/internal/resampler.h | 60 +
include/internal/riff.h | 24 +
include/internal/stack_alloc.h | 113 ++
include/internal/tarray.h | 31 +
licence.txt | 10 +
make/Makefile.inc | 39 -
make/config.bat | 33 -
make/config.sh | 37 -
make/djgpp.inc | 29 -
make/dumbask.c | 32 -
make/mingw.inc | 29 -
make/unix.inc | 21 -
src/allegro/datmod.c | 2 +-
src/allegro/datmodq.c | 2 +-
src/allegro/packfile.c | 69 +-
src/core/duhtag.c | 20 +
src/core/dumbfile.c | 39 +-
src/core/makeduh.c | 19 +
src/core/rawsig.c | 26 +-
src/core/rendduh.c | 149 +-
src/core/rendsig.c | 14 +-
src/helpers/barray.c | 189 ++
src/helpers/clickrem.c | 4 +-
src/helpers/fir_resampler.c | 281 +++
src/helpers/lpc.c | 320 ++++
src/helpers/memfile.c | 29 +-
src/helpers/resamp2.inc | 62 +-
src/helpers/resamp3.inc | 277 +--
src/helpers/resample.c | 153 +-
src/helpers/resample.inc | 193 +-
src/helpers/resampler.c | 1494 ++++++++++++++++
src/helpers/riff.c | 85 +
src/helpers/stdfile.c | 73 +-
src/helpers/tarray.c | 175 ++
src/it/itload.c | 1 +
src/it/itmisc.c | 4 +-
src/it/itread.c | 478 +++--
src/it/itrender.c | 3185 ++++++++++++++++++++++++++++-----
src/it/{loadmod.c => load669.c} | 14 +-
src/{core/duhtag.c => it/load6692.c} | 30 +-
src/it/{loadmod.c => loadamf.c} | 14 +-
src/it/{readmod2.c => loadamf2.c} | 19 +-
src/it/{loadmod.c => loadany.c} | 16 +-
src/it/{readmod2.c => loadany2.c} | 14 +-
src/it/{loadmod.c => loadasy.c} | 14 +-
src/it/{readmod2.c => loadasy2.c} | 19 +-
src/it/loadmod.c | 4 +-
src/it/loadmod2.c | 4 +-
src/it/{loadmod.c => loadmtm.c} | 14 +-
src/{core/duhtag.c => it/loadmtm2.c} | 30 +-
src/it/{loadmod.c => loadokt.c} | 14 +-
src/it/{readmod2.c => loadokt2.c} | 14 +-
src/it/{loadmod.c => loadoldpsm.c} | 19 +-
src/it/{readmod2.c => loadoldpsm2.c} | 19 +-
src/it/{loadmod.c => loadpsm.c} | 14 +-
src/{core/duhtag.c => it/loadpsm2.c} | 30 +-
src/it/{loadmod.c => loadptm.c} | 14 +-
src/{core/duhtag.c => it/loadptm2.c} | 30 +-
src/it/{loadmod.c => loadriff.c} | 24 +-
src/{core/duhtag.c => it/loadriff2.c} | 25 +-
src/it/{loadmod.c => loadstm.c} | 14 +-
src/{core/duhtag.c => it/loadstm2.c} | 25 +-
src/it/ptmeffect.c | 125 ++
src/it/read669.c | 448 +++++
src/it/{readmod2.c => read6692.c} | 18 +-
src/it/readam.c | 789 ++++++++
src/it/readamf.c | 559 ++++++
src/it/{readmod2.c => readamf2.c} | 14 +-
src/it/readany.c | 132 ++
src/it/{readmod2.c => readany2.c} | 12 +-
src/it/readasy.c | 339 ++++
src/it/readdsmf.c | 383 ++++
src/it/readmod.c | 397 ++--
src/it/readmod2.c | 4 +-
src/it/readmtm.c | 413 +++++
src/it/readokt.c | 558 ++++++
src/it/{readmod2.c => readokt2.c} | 14 +-
src/it/readoldpsm.c | 689 +++++++
src/it/readpsm.c | 1289 +++++++++++++
src/it/readptm.c | 554 ++++++
src/it/readriff.c | 57 +
src/it/reads3m.c | 274 ++-
src/it/readstm.c | 397 ++++
src/{core/duhtag.c => it/readstm2.c} | 25 +-
src/it/readxm.c | 665 +++++--
src/it/xmeffect.c | 24 +-
vc6/aldumb/aldumb.dsp | 158 --
vc6/dumb.dsw | 104 --
vc6/dumb/.gitignore | 3 +
vc6/dumb/dumb.dsp | 278 ---
vc6/dumb/dumb.vcproj | 2007 +++++++++++++++++++++
vc6/dumb/dumb.vcxproj | 209 +++
vc6/dumb/dumb.vcxproj.filters | 332 ++++
vc6/dumb2wav/dumb2wav.dsp | 90 -
vc6/dumb_static/dumb_static.dsp | 278 ---
vc6/dumbout/dumbout.dsp | 90 -
vc6/dumbplay/dumbplay.dsp | 90 -
124 files changed, 18599 insertions(+), 8648 deletions(-)
diff --cc .gitignore
index 845ca06,77eb956..e2d0678
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,44 +1,45 @@@
+.pc
+
+ # Cmake files
+ CMakeCache.txt
+ CMakeFiles
+ CMakeScripts
+ Makefile
+ cmake_install.cmake
+ install_manifest.txt
+
+ # Object files
+ *.o
+ *.ko
+ *.obj
+ *.elf
+
+ # Precompiled Headers
+ *.gch
+ *.pch
+
+ # Libraries
+ *.lib
+ *.a
+ *.la
+ *.lo
+
+ # Shared objects (inc. Windows DLLs)
+ *.dll
+ *.so
+ *.so.*
+ *.dylib
+
+ # Executables
+ *.exe
+ *.out
+ *.app
+ *.i*86
+ *.x86_64
+ *.hex
+
+ # Debug files
+ *.dSYM/
+
+ # Editors
+ .idea
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/libdumb.git
More information about the Pkg-games-commits
mailing list