Skip to content

Replace Makefile with autoconf for builds/detection/dist release #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Replace Makefile with autoconf for builds/detection/dist release #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65b3b27
use standard build hierarchy
Aug 11, 2015
b4fefff
use autoconf for builds
Aug 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 0 additions & 84 deletions Makefile
View file
Open in desktop

This file was deleted.

77 changes: 77 additions & 0 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
ACLOCAL_AMFLAGS = -Im4

CFLAGS += -std=c99 ${SIMD_FLAGS} -g -O6 -Wall -pedantic -I src/common
LDFLAGS = ${LIBM}

bin_PROGRAMS = thorenc thordec

common_SOURCES = \
src/common/common_block.c \
src/common/common_frame.c \
src/common/transform.c \
src/common/intra_prediction.c \
src/common/inter_prediction.c \
src/common/common_kernels.c \
src/common/snr.c \
src/common/simd.c

EXTRA_DIST = \
src/enc/putvlc.h \
src/enc/strings.h \
src/enc/encode_block.h \
src/enc/encode_frame.h \
src/enc/mainenc.h \
src/enc/enc_kernels.h \
src/enc/write_bits.h \
src/enc/putbits.h \
src/dec/maindec.h \
src/dec/read_bits.h \
src/dec/getvlc.h \
src/dec/decode_frame.h \
src/dec/decode_block.h \
src/dec/getbits.h \
src/common/snr.h \
src/common/common_frame.h \
src/common/intra_prediction.h \
src/common/transform.h \
src/common/types.h \
src/common/simd/v128_intrinsics.h \
src/common/simd/v64_intrinsics.h \
src/common/simd/v128_intrinsics_c.h \
src/common/simd/v128_intrinsics_arm.h \
src/common/simd/v128_intrinsics_x86.h \
src/common/simd/v64_intrinsics_arm.h \
src/common/simd/v64_intrinsics_x86.h \
src/common/simd/v64_intrinsics_c.h \
src/common/common_kernels.h \
src/common/inter_prediction.h \
src/common/simd.h \
src/common/common_block.h \
src/common/global.h


thorenc_SOURCES = \
src/enc/encode_block.c \
src/enc/encode_frame.c \
src/enc/mainenc.c \
src/enc/putbits.c \
src/enc/putvlc.c \
src/enc/strings.c \
src/enc/write_bits.c \
src/enc/enc_kernels.c \
$(common_SOURCES)

thordec_SOURCES = \
src/dec/decode_block.c \
src/dec/getbits.c \
src/dec/getvlc.c \
src/dec/maindec.c \
src/dec/read_bits.c \
src/dec/decode_frame.c \
$(common_SOURCES)

dist_doc_DATA = README.md LICENSE \
config_high_efficiency.txt \
config_low_complexity.txt \
config_RA_high_efficiency.txt \
config_RA_low_complexity.txt
3 changes: 3 additions & 0 deletions bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh
set -e
autoreconf --install
60 changes: 30 additions & 30 deletions build/dec/THORdec.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\common"
AdditionalIncludeDirectories="..\..\src\common"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
Expand Down Expand Up @@ -117,7 +117,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
AdditionalIncludeDirectories="..\..\Common\"
AdditionalIncludeDirectories="..\..\src\Common\"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS"
ExceptionHandling="0"
RuntimeLibrary="0"
Expand Down Expand Up @@ -176,55 +176,55 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\common\common_block.c"
RelativePath="..\..\src\common\common_block.c"
>
</File>
<File
RelativePath="..\..\common\common_frame.c"
RelativePath="..\..\src\common\common_frame.c"
>
</File>
<File
RelativePath="..\..\common\common_kernels.c"
RelativePath="..\..\src\common\common_kernels.c"
>
</File>
<File
RelativePath="..\..\dec\decode_block.c"
RelativePath="..\..\src\dec\decode_block.c"
>
</File>
<File
RelativePath="..\..\dec\decode_frame.c"
RelativePath="..\..\src\dec\decode_frame.c"
>
</File>
<File
RelativePath="..\..\dec\getbits.c"
RelativePath="..\..\src\dec\getbits.c"
>
</File>
<File
RelativePath="..\..\dec\getvlc.c"
RelativePath="..\..\src\dec\getvlc.c"
>
</File>
<File
RelativePath="..\..\common\inter_prediction.c"
RelativePath="..\..\src\common\inter_prediction.c"
>
</File>
<File
RelativePath="..\..\common\intra_prediction.c"
RelativePath="..\..\src\common\intra_prediction.c"
>
</File>
<File
RelativePath="..\..\dec\maindec.c"
RelativePath="..\..\src\dec\maindec.c"
>
</File>
<File
RelativePath="..\..\dec\read_bits.c"
RelativePath="..\..\src\dec\read_bits.c"
>
</File>
<File
RelativePath="..\..\common\simd.c"
RelativePath="..\..\src\common\simd.c"
>
</File>
<File
RelativePath="..\..\common\transform.c"
RelativePath="..\..\src\common\transform.c"
>
</File>
</Filter>
Expand All @@ -234,63 +234,63 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\..\common\common_block.h"
RelativePath="..\..\src\common\common_block.h"
>
</File>
<File
RelativePath="..\..\common\common_frame.h"
RelativePath="..\..\src\common\common_frame.h"
>
</File>
<File
RelativePath="..\..\common\common_kernels.h"
RelativePath="..\..\src\common\common_kernels.h"
>
</File>
<File
RelativePath="..\..\dec\decode_block.h"
RelativePath="..\..\src\dec\decode_block.h"
>
</File>
<File
RelativePath="..\..\dec\decode_frame.h"
RelativePath="..\..\src\dec\decode_frame.h"
>
</File>
<File
RelativePath="..\..\dec\getbits.h"
RelativePath="..\..\src\dec\getbits.h"
>
</File>
<File
RelativePath="..\..\dec\getvlc.h"
RelativePath="..\..\src\dec\getvlc.h"
>
</File>
<File
RelativePath="..\..\common\global.h"
RelativePath="..\..\src\common\global.h"
>
</File>
<File
RelativePath="..\..\common\inter_prediction.h"
RelativePath="..\..\src\common\inter_prediction.h"
>
</File>
<File
RelativePath="..\..\common\intra_prediction.h"
RelativePath="..\..\src\common\intra_prediction.h"
>
</File>
<File
RelativePath="..\..\dec\maindec.h"
RelativePath="..\..\src\dec\maindec.h"
>
</File>
<File
RelativePath="..\..\dec\read_bits.h"
RelativePath="..\..\src\dec\read_bits.h"
>
</File>
<File
RelativePath="..\..\common\simd.h"
RelativePath="..\..\src\common\simd.h"
>
</File>
<File
RelativePath="..\..\common\transform.h"
RelativePath="..\..\src\common\transform.h"
>
</File>
<File
RelativePath="..\..\common\types.h"
RelativePath="..\..\src\common\types.h"
>
</File>
</Filter>
Expand Down
Loading