From 5564537510b57cebb20d9707c79855e94337e36a Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Tue, 20 Mar 2012 19:30:50 +0000
Subject: [PATCH] Makefile: Update/fix treatment of libpng libraries and
 headers under Windows and OS X.

git-svn-id: https://svn.eduke32.com/eduke32@2509 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/polymer/eduke32/build/Makefile b/polymer/eduke32/build/Makefile
index b28792917..4dfdf1d60 100644
--- a/polymer/eduke32/build/Makefile
+++ b/polymer/eduke32/build/Makefile
@@ -73,11 +73,15 @@ endif
 
 ifneq ($(PLATFORM),WINDOWS)
     LIBS+= -ldl -pthread
+    ifneq ($(USE_LIBPNG),0)
+        LIBS+= -LWindows/lib -lpng -lz
+        OURCFLAGS+= -IWindows/include
+    endif
 endif
 ifeq ($(PLATFORM),DARWIN)
     ifneq ($(USE_LIBPNG),0)
-        OURCFLAGS+= -I/opt/local/include
-        LIBS+= -L/opt/local/lib -lpng
+        OURCFLAGS+= -I/opt/local/include -I/usr/local/include
+        LIBS+= -L/opt/local/lib -L/usr/local/lib -lpng
     endif
 endif