From 3a46c97fd0ea23cb1906d444d1f12c2732f416ed Mon Sep 17 00:00:00 2001
From: Daniel Richard G <skunk@iSKUNK.ORG>
Date: Wed, 13 Nov 2013 00:23:06 -0500
Subject: [PATCH] Reorganized the extlib/ subdirectory

LibPNG and zlib have been moved into their own subdirectories, consistent
with the SpaceWare Input library
---
 Makefile.msvc                  |   4 ++--
 extlib/{ => libpng}/libpng.lib | Bin
 extlib/{ => libpng}/png.h      |   0
 extlib/{ => libpng}/pngconf.h  |   0
 extlib/{ => zlib}/zconf.h      |   0
 extlib/{ => zlib}/zlib.h       |   0
 extlib/{ => zlib}/zlib.lib     | Bin
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename extlib/{ => libpng}/libpng.lib (100%)
 rename extlib/{ => libpng}/png.h (100%)
 rename extlib/{ => libpng}/pngconf.h (100%)
 rename extlib/{ => zlib}/zconf.h (100%)
 rename extlib/{ => zlib}/zlib.h (100%)
 rename extlib/{ => zlib}/zlib.lib (100%)

diff --git a/Makefile.msvc b/Makefile.msvc
index e1fd85f5..128c8515 100644
--- a/Makefile.msvc
+++ b/Makefile.msvc
@@ -6,7 +6,7 @@ HAVE_SPACEWARE_INPUT = 1
 DEFINES = /D_WIN32_WINNT=0x500 /DISOLATION_AWARE_ENABLED /D_WIN32_IE=0x500 /DWIN32_LEAN_AND_MEAN /DWIN32 /DPACKAGE_VERSION="\"2.1\""
 # Use the multi-threaded static libc because libpng and zlib do; not sure if anything bad
 # happens if those mix, but don't want to risk it.
-CXXFLAGS = /W3 /nologo /MT /D_DEBUG /D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS /I. /Iextlib /Zi /EHs  # /O2
+CXXFLAGS = /W3 /nologo /MT /D_DEBUG /D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS /I. /Iextlib /Iextlib\libpng /Iextlib\zlib /Zi /EHs  # /O2
 
 HEADERS = win32\freeze.h ui.h solvespace.h dsc.h sketch.h expr.h polygon.h srf\surface.h
 
@@ -65,7 +65,7 @@ SRFOBJS =  $(OBJDIR)\boolean.obj \
 RES = $(OBJDIR)\resource.res
 
 LIBS = user32.lib gdi32.lib comctl32.lib advapi32.lib shell32.lib opengl32.lib glu32.lib \
-       extlib\libpng.lib extlib\zlib.lib
+       extlib\libpng\libpng.lib extlib\zlib\zlib.lib
 
 PERL = perl
 
diff --git a/extlib/libpng.lib b/extlib/libpng/libpng.lib
similarity index 100%
rename from extlib/libpng.lib
rename to extlib/libpng/libpng.lib
diff --git a/extlib/png.h b/extlib/libpng/png.h
similarity index 100%
rename from extlib/png.h
rename to extlib/libpng/png.h
diff --git a/extlib/pngconf.h b/extlib/libpng/pngconf.h
similarity index 100%
rename from extlib/pngconf.h
rename to extlib/libpng/pngconf.h
diff --git a/extlib/zconf.h b/extlib/zlib/zconf.h
similarity index 100%
rename from extlib/zconf.h
rename to extlib/zlib/zconf.h
diff --git a/extlib/zlib.h b/extlib/zlib/zlib.h
similarity index 100%
rename from extlib/zlib.h
rename to extlib/zlib/zlib.h
diff --git a/extlib/zlib.lib b/extlib/zlib/zlib.lib
similarity index 100%
rename from extlib/zlib.lib
rename to extlib/zlib/zlib.lib