Update for libpng16

cosarara · Jan 13, 2015 · b27bc1b · b27bc1b · nanoemu · Jan 13, 2015
1 parent 442a21b
commit b27bc1b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -5,9 +5,9 @@ TARGET = vba-sdl-h
 BININSTALLPATH = /usr/bin
 ETC = /etc
 
-INCLUDES = -I/usr/include/libpng12 -I/usr/include/SDL -Isrc
+INCLUDES = -I/usr/include/libpng16 -I/usr/include/SDL -Isrc
 
-LIBS = -L/usr/lib -lSDL -lpthread -lreadline -lpng12 -lz -lminizip
+LIBS = -L/usr/lib -lSDL -lpthread -lreadline -lpng16 -lz -lminizip
 
 CXXFLAGS = -Wno-write-strings -DBKPT_SUPPORT -DSYSCONFDIR=\"/etc\" \
 -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" \
@@ -41,7 +41,7 @@ OBJECTS = ./src/motionblur.o ./src/agbprint.o \
 	$(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@
 
 $(TARGET): $(OBJECTS)
-	g++ $(INCLUDES) $^ -o $@ $(LIBS) 
+	g++ $(INCLUDES) $^ -o $@ $(LIBS)
 
 clean:
 	rm -f $(OBJECTS) $(TARGET)

diff --git a/src/Util.cpp b/src/Util.cpp
@@ -78,7 +78,7 @@ bool utilWritePNGFile(const char *fileName, int w, int h, u8 *pix)
     return false;
   }
 
-  if(setjmp(png_ptr->jmpbuf)) {
+  if(setjmp(png_jmpbuf(png_ptr))) {
     png_destroy_write_struct(&png_ptr,NULL);
     fclose(fp);
     return false;