No custom zlib for physfs build and fixed windows template

Assets/Templates/C++/Windows/Polycode.props

@@ -5,8 +5,8 @@
     <PolycodeDir>$(SolutionDir)..\..\</PolycodeDir>
     <PolycodeCoreLibsDebug>Polycore_d.lib</PolycodeCoreLibsDebug>
     <PolycodeCoreLibsRelease>Polycore.lib</PolycodeCoreLibsRelease>
-    <PolycodeDependLibsDebug>freetype_d.lib;liboggd.lib;libpng15_staticd.lib;libvorbisd.lib;libvorbisfiled.lib;lua5.1d.lib;OpenAL32d.lib;physfsd.lib;zlibd.lib;zlibstaticd.lib</PolycodeDependLibsDebug>
-    <PolycodeDependLibsRelease>freetype.lib;libogg.lib;libpng15_static.lib;libvorbis.lib;libvorbisfile.lib;lua5.1.lib;OpenAL32.lib;physfs.lib;zlib.lib;zlibstatic.lib</PolycodeDependLibsRelease>
+    <PolycodeDependLibsDebug>Polycore_d.lib;zlibd.lib;freetype_d.lib;liboggd.lib;libvorbisd.lib;libvorbisfiled.lib;OpenAL32d.lib;physfsd.lib;libpng15_staticd.lib</PolycodeDependLibsDebug>
+    <PolycodeDependLibsRelease>Polycore.lib;zlib.lib;freetype.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;OpenAL32.lib;physfs.lib;libpng15_static.lib</PolycodeDependLibsRelease>
     <PolycodeWinLibsDebug>opengl32.lib;glu32.lib;winmm.lib;ws2_32.lib</PolycodeWinLibsDebug>
     <PolycodeWinLibsRelease>opengl32.lib;glu32.lib;winmm.lib;ws2_32.lib</PolycodeWinLibsRelease>
     <PolycodeLibsDebug>$(PolycodeCoreLibsDebug);$(PolycodeDependLibsDebug);$(PolycodeWinLibsDebug)</PolycodeLibsDebug>
@@ -16,7 +16,7 @@
     <IncludePath>$(PolycodeDir)Core\include;$(PolycodeDir)Core\Dependencies\include;$(PolycodeDir)Core\PolycodeView;$(PolycodeDir)Core\Dependencies\include\AL;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup>
-    <LibraryPath>$(PolycodeDir)Core\lib;$(PolycodeDir)Core\Dependencies\lib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(PolycodeDir)Core\lib;$(PolycodeDir)Core\Dependencies\lib;$(PolycodeDir)Modules\lib;$(PolycodeDir)Modules\Dependencies\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -28,16 +28,14 @@
       <SubSystem>Windows</SubSystem>
     </Link>
     <PostBuildEvent>
-      <Command>if not exist "$(ProjectDir)default.pak" copy "$(PolycodeDir)Core\Assets\default.pak" "$(ProjectDir)"
+ <Command>if not exist "$(ProjectDir)default.pak" copy "$(PolycodeDir)Core\Assets\default.pak" "$(ProjectDir)"
 if not exist "$(ProjectDir)hdr.pak" copy "$(PolycodeDir)Core\Assets\hdr.pak" "$(ProjectDir)"
 
 if "$(ConfigurationName)" == "Debug" (
   if not exist "$(TargetDir)OpenAL32d.dll" copy "$(PolycodeDir)Core\Dependencies\bin\OpenAL32d.dll" "$(TargetDir)"
-  if not exist "$(TargetDir)zlibd.dll" copy "$(PolycodeDir)Core\Dependencies\bin\zlibd.dll" "$(TargetDir)"
 ) else (
     if not exist "$(TargetDir)OpenAL32.dll" copy "$(PolycodeDir)Core\Dependencies\bin\OpenAL32.dll" "$(TargetDir)"
-    if not exist "$(TargetDir)zlib.dll" copy "$(PolycodeDir)Core\Dependencies\bin\zlib.dll" "$(TargetDir)"
-)</Command>
+)</Command>    
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>Copying polycode pak files and dlls to project</Message>

CMake/physfs.cmake

@@ -266,7 +266,7 @@ IF(PHYSFS_NEED_ZLIB)
     IF(PHYSFS_INTERNAL_ZLIB)
         INCLUDE_DIRECTORIES(zlib123)
         ADD_DEFINITIONS(-DZ_PREFIX=1)
-        SET(PHYSFS_SRCS ${PHYSFS_SRCS} ${ZLIB_SRCS})
+        SET(PHYSFS_SRCS ${PHYSFS_SRCS})
     ELSE(PHYSFS_INTERNAL_ZLIB)
         SET(OPTIONAL_LIBRARY_LIBS ${OPTIONAL_LIBRARY_LIBS} ${ZLIB_LIBRARY})
         INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})