Resolved merges again

diff --git a/.hgignore b/.hgignore
index 4165d64913aac8ba6cf2b4cb6996994e9f04b723..4c53c5241ede9f477d9ba9fbda5b4c2caff72fbf 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -4,3 +4,6 @@ run
 Xcode/build
 Xcode/*.xcodeproj/*.mode1v3
 Xcode/*.xcodeproj/*.pbxuser
+build
+*~
+.*.swp

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 9affb71359f7c2401d00640ccf4555d2b00cad0a..7fbeb494e423053f40bb92037ef9eae2f931f84e 100644 (file)
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -2679,7 +2679,7 @@ static bool load_png(const char *file_name, TGAImageRec &tex)
     png_init_io(png_ptr, fp);
     png_read_png(png_ptr, info_ptr,
                  PNG_TRANSFORM_STRIP_16 | PNG_TRANSFORM_PACKING,
-                 png_voidp_NULL);
+                 NULL);
     png_get_IHDR(png_ptr, info_ptr, &width, &height,
                  &bit_depth, &color_type, &interlace_type, NULL, NULL);
 
@@ -2729,7 +2729,7 @@ static bool load_png(const char *file_name, TGAImageRec &tex)
     retval = true;
 
 png_done:
-    png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+    png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
     if (fp)
         fclose(fp);
     return (retval);

diff --git a/cmake/Modules/FindOggVorbis.cmake b/cmake/Modules/FindOggVorbis.cmake
index 0ca186703c1cf4c5c604f8d835691ba1e119a49e..46ec6949506d284e9ee9d68425c31249d7893786 100644 (file)
--- a/cmake/Modules/FindOggVorbis.cmake
+++ b/cmake/Modules/FindOggVorbis.cmake
@@ -74,7 +74,7 @@ check_library_exists(vorbis vorbis_bitrate_addblock "" HAVE_LIBVORBISENC2)
 
 if (HAVE_LIBOGG AND HAVE_VORBISFILE_H AND HAVE_LIBVORBIS AND HAVE_LIBVORBISFILE AND HAVE_LIBVORBISENC)
     message(STATUS "Ogg/Vorbis found")
-    set (VORBIS_LIBS "-lvorbis -logg")
+    set (VORBIS_LIBS "-lvorbis")
     set (OGG_LIBS "-logg")
     set (VORBISFILE_LIBS "-lvorbisfile")
     set (VORBISENC_LIBS "-lvorbisenc")