Skip to content

Commit 1bbd93d

Browse files
BlockoSBlockoS
committed
Appveyor now uses main CMake configuration script.
Updated makefiles.
1 parent 44b20fa commit 1bbd93d

File tree

21 files changed

+66
-35
lines changed

21 files changed

+66
-35
lines changed

‎Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
#CXXFLAGS += -DTINYEXR_USE_ZFP=1 -I./deps/ZFP/inc
77
#LDFLAGS += -L./deps/ZFP/lib -lzfp
88

9+
CFLAGS += -I./deps/miniz
910
CXXFLAGS += -I./deps/miniz
1011

1112
miniz.o:
12-
$(CXX) $(CXXFLAGS) -c miniz.c
13+
$(CC) $(CFLAGS) -c ./deps/miniz/miniz.c
1314

1415
all:
1516
$(CXX) $(CXXFLAGS) -o test_tinyexr test_tinyexr.cc miniz.o $(LDFLAGS)

‎Makefile.gcc-mingw

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ CXX=x86_64-w64-mingw32-g++
99
#LDFLAGS += -L./deps/ZFP/lib -lzfp
1010

1111
all:
12-
$(CXX) $(CXXFLAGS) -o test_tinyexr test_tinyexr.cc $(LDFLAGS)
12+
$(CC) $(CFLAGS) -c ./deps/miniz/miniz.c
13+
$(CXX) $(CXXFLAGS) -I./deps/miniz -o test_tinyexr test_tinyexr.cc miniz.o $(LDFLAGS)
1314

1415
test:
1516
./test_tinyexr asakusa.exr

‎Makefile.gcc-mingw-msys

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ CXX=g++
77
CXXFLAGS=-DUNICODE -D_UNICODE -mwindows
88

99
all:
10-
$(CXX) $(CXXFLAGS) -o test_tinyexr test_tinyexr.cc $(LDFLAGS)
10+
$(CC) $(CFLAGS) -I./deps/miniz ./deps/miniz.c
11+
$(CXX) $(CXXFLAGS) -I./deps/miniz -o test_tinyexr test_tinyexr.cc miniz.o $(LDFLAGS)
1112

1213
test:
1314
./test_tinyexr asakusa.exr

‎Makefile.llvm-mingw

+7-5
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@
22
#CXXFLAGS ?= -fsanitize=address -Werror -Wall -Wextra -g -O0 -DTINYEXR_USE_MINIZ=0 -DTINYEXR_USE_PIZ=0
33
#LDFLAGS ?= -lz
44

5-
CXX=$(HOME)/local/llvm-mingw-20200325-ubuntu-18.04/bin/x86_64-w64-mingw32-clang++
5+
CC=clang
6+
CXX=clang++
67

78
# ZFP
89
#CXXFLAGS += -DTINYEXR_USE_ZFP=1 -I./deps/ZFP/inc
910
#LDFLAGS += -L./deps/ZFP/lib -lzfp
1011

11-
# miniz
1212
CXXFLAGS += -DTINYEXR_USE_MINIZ=1 -I./deps/miniz
13-
miniz.o:
14-
$(CXX) $(CXXFLAGS) -c ./deps/miniz.c
13+
CFLAGS += -DTINYEXR_USE_MINIZ=1 -I./deps/miniz
1514

15+
# miniz
16+
miniz.o:
17+
$(CC) $(CFLAGS) -c ./deps/miniz.c
1618
#
17-
all:
19+
all: miniz.o
1820
$(CXX) $(CXXFLAGS) -o test_tinyexr test_tinyexr.cc miniz.o $(LDFLAGS)
1921

2022
test:

‎appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ configuration: Release
66
before_build:
77
- echo running cmake...
88
- cd test
9-
- cmake -G "Visual Studio 12 Win64" -Bbuild -H.
9+
- cmake -G "Visual Studio 12 Win64" -Bbuild -H..
1010

1111
build:
1212
parallel: true

‎examples/cube2longlat/Makefile

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
INC_DIR = -I../../ -I../common
1+
INC_DIR = -I../../ -I../common -I ../../deps/miniz
22

33
INCLUDES := ../../tinyexr.h
4-
OBJS := tinyexr.o cube2longlat.o
4+
OBJS := miniz.o tinyexr.o cube2longlat.o
55

6-
CXXFLAGS := -fsanitize=address -std=c++11 -O2
6+
CFLAGS := -fsanitize=address -O2
7+
CXXFLAGS := $(CFLAGS) -std=c++11
78
LDFLAGS := -fsanitize=address
89

910
TARGET=cube2longlat
@@ -13,6 +14,9 @@ all: $(TARGET)
1314
$(TARGET): $(OBJS)
1415
$(CXX) -o $(TARGET) $(LDFLAGS) $(OBJS)
1516

17+
miniz.o: ../../deps/miniz/miniz.c
18+
$(CC) $(CFLAGS) -c $(INC_DIR) $<
19+
1620
tinyexr.o: ../../tinyexr.cc
1721
$(CXX) $(CXXFLAGS) -c $(INC_DIR) $<
1822

‎examples/deepview/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
all:
2-
g++ -o deepview -g -O2 main.cc trackball.cc ../../tinyexr.cc -framework OpenGL -framework GLUT
2+
g++ -I ../../deps/miniz -o deepview -g -O2 main.cc trackball.cc ../../tinyexr.cc ../../deps/miniz/miniz.c -framework OpenGL -framework GLUT

‎examples/exr2fptiff/Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11

22
CXX=clang++
33

4-
CXXFLAGS = -std=c++11 -fsanitize=address -Weverything -Werror -Wno-c++98-compat -Wno-padded -Wno-variadic-macros -g -O2 -I../../
4+
CFLAGS = -fsanitize=address -Weverything -Wno-padded -g -O2 -I../../ -I../../deps/miniz
5+
CXXFLAGS = -std=c++11 -Wno-c++98-compat -Wno-variadic-macros $(CFLAGS)
56
LDFLAGS = -fsanitize=address
67

78
# ZFP
@@ -20,6 +21,9 @@ exr2fptiff.o: exr2fptiff.cc tiny_dng_writer.h
2021
tinyexr.o: ../../tinyexr.cc
2122
$(CXX) $(CXXFLAGS) -c -o $@ $<
2223

24+
miniz.o: ../../deps/miniz/miniz.c
25+
$(CC) $(CFLAGS) -c $(INC_DIR) $<
26+
2327
.PHONY: clean
2428

2529

‎examples/exr2ldr/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
all:
2-
clang++ -g -fsanitize=address -O2 -o exr2ldr -I../common -I../../ exr2ldr.cc ../../tinyexr.cc
2+
clang -g -O2 -c -I../../deps/miniz ../../deps/miniz/miniz.c
3+
clang++ -g -fsanitize=address -O2 -o exr2ldr -I../common -I../../ -I../../deps/miniz exr2ldr.cc ../../tinyexr.cc

‎examples/exr2rgbe/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
all:
2-
g++ -O2 -o exr2rgbe -I../common -I../../ exr2rgbe.cc ../../tinyexr.cc
2+
gcc -O2 -c -I../../deps/miniz ../../deps/miniz/miniz.c
3+
g++ -O2 -o exr2rgbe -I../common -I../../ -I../../deps/miniz exr2rgbe.cc ../../tinyexr.cc miniz.o

‎examples/exrfilter/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
all:
2-
g++ -std=c++11 -O2 -o exrfilter -I../common -I../../ exrfilter.cc ../../tinyexr.cc
2+
gcc -O2 -c -I../../deps/miniz ../../deps/miniz/miniz.c
3+
g++ -std=c++11 -O2 -o exrfilter -I../common -I../../ -I ../../deps/miniz exrfilter.cc ../../tinyexr.cc miniz.o

‎examples/exrview/premake4.lua

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ newoption {
66
sources = {
77
"main.cc",
88
"exr-io.cc",
9-
}
9+
"../../deps/miniz/miniz.c"
10+
}
1011

1112
-- premake4.lua
1213
solution "EXRViewSolution"
@@ -26,7 +27,7 @@ solution "EXRViewSolution"
2627
language "C++"
2728
files { sources }
2829

29-
includedirs { "./", "../../" }
30+
includedirs { "./", "../../", "../../deps/miniz" }
3031

3132
if os.is("Windows") then
3233
defines { "USE_NATIVEFILEDIALOG" }

‎examples/ldr2exr/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
all:
2-
g++ -O2 -o ldr2exr -I../common -I../../ ldr2exr.cc ../../tinyexr.cc
2+
gcc -O2 -c -I../../deps/miniz ../../deps/miniz/miniz.c
3+
g++ -O2 -o ldr2exr -I../common -I../../ -I../../deps/miniz ldr2exr.cc ../../tinyexr.cc miniz.o

‎examples/nornalmap/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
all:
2-
clang++ -O2 -g -fsanitize=address -I../common -I../../ -o normalmap main.cc
2+
clang -O2 -c -I../../deps/miniz ../../deps/miniz/miniz.c
3+
clang++ -O2 -g -fsanitize=address -I../common -I../../ -I../../deps/miniz -o normalmap main.cc miniz.o

‎examples/nornalmap/main.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ int main(int argc, char **argv)
255255
// assume EXR.
256256
float *rgba = nullptr;
257257
int width, height;
258-
int ret = SaveEXR(dst.data(), int(src_width), int(src_height), /* component */3, /* fp16 */0, output_filename.c_str());
258+
int ret = SaveEXR(dst.data(), int(src_width), int(src_height), /* component */3, /* fp16 */0, output_filename.c_str(), nullptr);
259259
if (TINYEXR_SUCCESS != ret) {
260260
std::cerr << "Failed to save EXR file [" << input_filename << "] code = " << ret << std::endl;
261261
return EXIT_FAILURE;

‎examples/resize/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
all:
2-
clang++ -fsanitize=undefined -O2 -o exrresize -I../common -I../../ resize.cc ../../tinyexr.cc
2+
clang -g -O2 -c -I../../deps/miniz ../../deps/miniz/miniz.c
3+
clang++ -fsanitize=undefined -O2 -o exrresize -I../common -I../../ -I../../deps/miniz resize.cc ../../tinyexr.cc miniz.o

‎examples/rgbe2exr/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
all:
2-
g++ -O2 -o rgbe2exr -I../common -I../../ rgbe2exr.cc ../../tinyexr.cc
2+
gcc -O2 -c -I../../deps/miniz ../../deps/miniz/miniz.c
3+
g++ -O2 -o rgbe2exr -I../common -I../../ -I../../deps/miniz rgbe2exr.cc ../../tinyexr.cc miniz.o

‎examples/testmapgen/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
all:
2-
g++ -std=c++11 -O2 -o testmapgen -I../common -I../../ testmapgen.cc ../../tinyexr.cc
2+
gcc -O2 -I../../deps/miniz -c ../../deps/miniz/miniz.c
3+
g++ -std=c++11 -O2 -o testmapgen -I../common -I../../ -I../../deps/miniz testmapgen.cc ../../tinyexr.cc miniz.o

‎test/c-binding/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
all:
2-
g++ -c -I../../ ../../tinyexr.cc
2+
gcc -c -I../../deps/miniz ../../deps/miniz/miniz.c
3+
g++ -c -I../../ -I../../deps/miniz ../../tinyexr.cc
34
gcc -c -I../../ test.c
4-
gcc test.o tinyexr.o -lstdc++
5+
gcc test.o tinyexr.o miniz.o -lstdc++

‎test/fuzzer/Makefile

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
ISSUE_63_FLAGS=-O1 -g -fsanitize=address,bool,float-cast-overflow,integer-divide-by-zero,return,returns-nonnull-attribute,shift-exponent,signed-integer-overflow,unreachable,vla-bound -fno-sanitize-recover=all -funsigned-char
22

3-
all:
4-
clang++ -std=c++11 -o fuzz_62 -I../../ -g -fsanitize=address fuzz.cc /usr/lib/llvm-5.0/lib/libFuzzer.a
5-
clang++ -std=c++11 -o fuzz_63 -I../../ ${ISSUE_63_FLAGS} fuzz.cc /usr/lib/llvm-5.0/lib/libFuzzer.a
3+
all: miniz
4+
clang++ -std=c++11 -o fuzz_62 -I../../ -I../../deps/miniz -g -fsanitize=address fuzz.cc /usr/lib/llvm-5.0/lib/libFuzzer.a libminiz.a
5+
clang++ -std=c++11 -o fuzz_63 -I../../ -I../../deps/miniz ${ISSUE_63_FLAGS} fuzz.cc /usr/lib/llvm-5.0/lib/libFuzzer.a libminiz.a
66

7+
miniz:
8+
clang -c -I../../deps/miniz -g ../../deps/miniz/miniz.c
9+
llvm-ar rc libminiz.a miniz.o
710

811
t:
912
./fuzz_62 issue-62-tinyexr_memcpy_heap-buffer-overflow

‎test/unit/Makefile

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
.PHONY: clean
22

3+
CC = clang
34
CXX = clang++
4-
CXXFLAGS = -fsanitize=address,undefined -g -O2 -std=c++11
5-
6-
tester: tester.cc ../../tinyexr.h
7-
$(CXX) $(CXXFLAGS) -o tester tester.cc
5+
CXXFLAGS = -fsanitize=address,undefined -g -O2 -std=c++11 -I ../../deps/miniz
6+
CFLAGS = -fsanitize=address,undefined -g -O2 -I ../../deps/miniz
87

98
all: tester
109

10+
miniz.o:
11+
$(CC) -c $(CFLAGS) ../../deps/miniz/miniz.c
12+
13+
tester: tester.cc ../../tinyexr.h miniz.o
14+
$(CXX) $(CXXFLAGS) -o tester tester.cc miniz.o
15+
1116
check: tester
1217
./tester
1318

1419
clean:
15-
rm -rf tester
20+
rm -rf tester miniz.o
1621

0 commit comments

Comments
 (0)