Merge branch 'master' of https://github.com/chocolate-doom/chocolate-…

…doom
fabiangreffrath · Mar 26, 2014 · 638c70c · 638c70c
2 parents 76799c2 + 2b4eb0f
commit 638c70c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -86,7 +86,8 @@ AC_SDL_MAIN_WORKAROUND([
         [Build without libpng @<:@default=check@:>@]),
     [],
     [
-        AC_CHECK_LIB(png, png_get_io_ptr, [], [], -lz)
+        AC_CHECK_LIB(z, zlibVersion)
+        AC_CHECK_LIB(png, png_get_io_ptr)
     ])
     AC_CHECK_LIB(m, log)
 

diff --git a/src/d_iwad.c b/src/d_iwad.c
@@ -342,7 +342,7 @@ static void CheckSteamGUSPatches(void)
     int len;
 
     // Already configured? Don't stomp on the user's choices.
-    current_path = D_GetStrVariable("gus_patch_path");
+    current_path = M_GetStrVariable("gus_patch_path");
     if (current_path != NULL && strlen(current_path) > 0)
     {
         return;
@@ -365,7 +365,7 @@ static void CheckSteamGUSPatches(void)
     {
         snprintf(patch_path, len, "%s\\%s",
                  install_path, STEAM_BFG_GUS_PATCHES);
-        D_SetVariable("gus_patch_path", patch_path);
+        M_SetVariable("gus_patch_path", patch_path);
     }
 
     free(patch_path);