Appveyor now uses main CMake configuration script.

Updated makefiles.

Makefile

@@ -6,10 +6,11 @@
 #CXXFLAGS += -DTINYEXR_USE_ZFP=1 -I./deps/ZFP/inc
 #LDFLAGS += -L./deps/ZFP/lib -lzfp
 
+CFLAGS += -I./deps/miniz
 CXXFLAGS += -I./deps/miniz
 
 miniz.o:
-	$(CXX) $(CXXFLAGS) -c miniz.c
+	$(CC) $(CFLAGS) -c ./deps/miniz/miniz.c
 
 all:
 	$(CXX) $(CXXFLAGS) -o test_tinyexr test_tinyexr.cc miniz.o $(LDFLAGS)

Makefile.gcc-mingw

@@ -9,7 +9,8 @@ CXX=x86_64-w64-mingw32-g++
 #LDFLAGS += -L./deps/ZFP/lib -lzfp
 
 all:
-	$(CXX) $(CXXFLAGS) -o test_tinyexr test_tinyexr.cc $(LDFLAGS)
+	$(CC) $(CFLAGS) -c ./deps/miniz/miniz.c
+	$(CXX) $(CXXFLAGS) -I./deps/miniz -o test_tinyexr test_tinyexr.cc miniz.o $(LDFLAGS)
 
 test:
 	./test_tinyexr asakusa.exr

Makefile.gcc-mingw-msys

@@ -7,7 +7,8 @@ CXX=g++
 CXXFLAGS=-DUNICODE -D_UNICODE -mwindows
 
 all:
-	$(CXX) $(CXXFLAGS) -o test_tinyexr test_tinyexr.cc $(LDFLAGS)
+	$(CC) $(CFLAGS) -I./deps/miniz ./deps/miniz.c
+	$(CXX) $(CXXFLAGS) -I./deps/miniz -o test_tinyexr test_tinyexr.cc miniz.o $(LDFLAGS)
 
 test:
 	./test_tinyexr asakusa.exr

Makefile.llvm-mingw

@@ -2,19 +2,21 @@
 #CXXFLAGS ?= -fsanitize=address -Werror -Wall -Wextra -g -O0 -DTINYEXR_USE_MINIZ=0 -DTINYEXR_USE_PIZ=0
 #LDFLAGS ?= -lz
 
-CXX=$(HOME)/local/llvm-mingw-20200325-ubuntu-18.04/bin/x86_64-w64-mingw32-clang++
+CC=clang
+CXX=clang++
 
 # ZFP
 #CXXFLAGS += -DTINYEXR_USE_ZFP=1 -I./deps/ZFP/inc
 #LDFLAGS += -L./deps/ZFP/lib -lzfp
 
-# miniz
 CXXFLAGS += -DTINYEXR_USE_MINIZ=1 -I./deps/miniz
-miniz.o:
-	$(CXX) $(CXXFLAGS) -c ./deps/miniz.c
+CFLAGS += -DTINYEXR_USE_MINIZ=1 -I./deps/miniz
 
+# miniz
+miniz.o:
+	$(CC) $(CFLAGS) -c ./deps/miniz.c
 # 
-all:
+all: miniz.o
 	$(CXX) $(CXXFLAGS) -o test_tinyexr test_tinyexr.cc miniz.o $(LDFLAGS)
 
 test:

appveyor.yml

@@ -6,7 +6,7 @@ configuration: Release
 before_build:
   - echo running cmake...
   - cd test
-  - cmake -G "Visual Studio 12 Win64" -Bbuild -H.
+  - cmake -G "Visual Studio 12 Win64" -Bbuild -H..
 
 build:
   parallel: true

examples/cube2longlat/Makefile

@@ -1,9 +1,10 @@
-INC_DIR = -I../../ -I../common
+INC_DIR = -I../../ -I../common -I ../../deps/miniz
 
 INCLUDES := ../../tinyexr.h
-OBJS := tinyexr.o cube2longlat.o
+OBJS := miniz.o tinyexr.o cube2longlat.o
 
-CXXFLAGS := -fsanitize=address -std=c++11 -O2
+CFLAGS := -fsanitize=address -O2
+CXXFLAGS := $(CFLAGS) -std=c++11
 LDFLAGS := -fsanitize=address
 
 TARGET=cube2longlat
@@ -13,6 +14,9 @@ all: $(TARGET)
 $(TARGET): $(OBJS)
 	$(CXX) -o $(TARGET) $(LDFLAGS) $(OBJS)
 
+miniz.o: ../../deps/miniz/miniz.c
+	$(CC) $(CFLAGS) -c $(INC_DIR) $<
+
 tinyexr.o: ../../tinyexr.cc
 	$(CXX) $(CXXFLAGS) -c $(INC_DIR) $<
 

examples/deepview/Makefile

@@ -1,2 +1,2 @@
 all:
-	g++ -o deepview -g -O2 main.cc trackball.cc ../../tinyexr.cc -framework OpenGL -framework GLUT
+	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

@@ -1,7 +1,8 @@
 
 CXX=clang++
 
-CXXFLAGS = -std=c++11 -fsanitize=address -Weverything -Werror -Wno-c++98-compat -Wno-padded -Wno-variadic-macros -g -O2 -I../../
+CFLAGS = -fsanitize=address -Weverything -Wno-padded -g -O2 -I../../ -I../../deps/miniz
+CXXFLAGS = -std=c++11 -Wno-c++98-compat -Wno-variadic-macros $(CFLAGS)
 LDFLAGS = -fsanitize=address
 
 # ZFP
@@ -20,6 +21,9 @@ exr2fptiff.o: exr2fptiff.cc tiny_dng_writer.h
 tinyexr.o: ../../tinyexr.cc
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
+miniz.o: ../../deps/miniz/miniz.c
+	$(CC) $(CFLAGS) -c $(INC_DIR) $<
+
 .PHONY: clean
 
 

examples/exr2ldr/Makefile

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

examples/exr2rgbe/Makefile

@@ -1,2 +1,3 @@
 all:
-	g++ -O2 -o exr2rgbe -I../common -I../../ exr2rgbe.cc ../../tinyexr.cc
+	gcc -O2 -c -I../../deps/miniz ../../deps/miniz/miniz.c
+	g++ -O2 -o exr2rgbe -I../common -I../../  -I../../deps/miniz  exr2rgbe.cc ../../tinyexr.cc miniz.o

examples/exrfilter/Makefile

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

examples/exrview/premake4.lua

@@ -6,7 +6,8 @@ newoption {
 sources = {
    "main.cc",
    "exr-io.cc",
-   }
+   "../../deps/miniz/miniz.c"
+}
 
 -- premake4.lua
 solution "EXRViewSolution"
@@ -26,7 +27,7 @@ solution "EXRViewSolution"
       language "C++"
       files { sources }
 
-      includedirs { "./", "../../" }
+      includedirs { "./", "../../", "../../deps/miniz" }
 
       if os.is("Windows") then
          defines { "USE_NATIVEFILEDIALOG" }

examples/ldr2exr/Makefile

@@ -1,2 +1,3 @@
 all:
-	g++ -O2 -o ldr2exr -I../common -I../../ ldr2exr.cc ../../tinyexr.cc
+	gcc -O2 -c -I../../deps/miniz ../../deps/miniz/miniz.c
+	g++ -O2 -o ldr2exr -I../common -I../../ -I../../deps/miniz ldr2exr.cc ../../tinyexr.cc miniz.o

examples/nornalmap/Makefile

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

examples/nornalmap/main.cc

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

examples/resize/Makefile

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

examples/rgbe2exr/Makefile

@@ -1,2 +1,3 @@
 all:
-	g++ -O2 -o rgbe2exr -I../common -I../../ rgbe2exr.cc ../../tinyexr.cc
+	gcc -O2 -c -I../../deps/miniz ../../deps/miniz/miniz.c
+	g++ -O2 -o rgbe2exr -I../common -I../../ -I../../deps/miniz rgbe2exr.cc ../../tinyexr.cc miniz.o

examples/testmapgen/Makefile

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

test/c-binding/Makefile

@@ -1,4 +1,5 @@
 all:
-	g++ -c -I../../ ../../tinyexr.cc
+	gcc -c -I../../deps/miniz ../../deps/miniz/miniz.c
+	g++ -c -I../../ -I../../deps/miniz ../../tinyexr.cc
 	gcc -c -I../../ test.c
-	gcc test.o tinyexr.o -lstdc++
+	gcc test.o tinyexr.o miniz.o -lstdc++

test/fuzzer/Makefile

@@ -1,9 +1,12 @@
 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
 
-all:
-	clang++ -std=c++11 -o fuzz_62 -I../../ -g -fsanitize=address fuzz.cc /usr/lib/llvm-5.0/lib/libFuzzer.a
-	clang++ -std=c++11 -o fuzz_63 -I../../ ${ISSUE_63_FLAGS} fuzz.cc /usr/lib/llvm-5.0/lib/libFuzzer.a
+all: miniz
+	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
+	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
 
+miniz:
+	clang -c -I../../deps/miniz -g ../../deps/miniz/miniz.c
+	llvm-ar rc libminiz.a miniz.o
 
 t:
 	./fuzz_62 issue-62-tinyexr_memcpy_heap-buffer-overflow

test/unit/Makefile

@@ -1,16 +1,21 @@
 .PHONY: clean
 
+CC = clang
 CXX = clang++
-CXXFLAGS = -fsanitize=address,undefined -g -O2 -std=c++11
-
-tester: tester.cc ../../tinyexr.h
-	$(CXX) $(CXXFLAGS) -o tester tester.cc
+CXXFLAGS = -fsanitize=address,undefined -g -O2 -std=c++11 -I ../../deps/miniz
+CFLAGS = -fsanitize=address,undefined -g -O2 -I ../../deps/miniz
 
 all: tester
 
+miniz.o:
+	$(CC) -c $(CFLAGS) ../../deps/miniz/miniz.c
+
+tester: tester.cc ../../tinyexr.h miniz.o
+	$(CXX) $(CXXFLAGS) -o tester tester.cc miniz.o
+
 check: tester
 	./tester
 
 clean:
-	rm -rf tester
+	rm -rf tester miniz.o