[mapserver-commits] r12113 - in branches/branch-6-0/mapserver: . mapscript/php

[svn at osgeo.org]

Author: tamas
Date: 2011-08-25 07:02:51 -0700 (Thu, 25 Aug 2011)
New Revision: 12113

Modified:
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/mapscript/php/Makefile.vc
Log:
Fix mapscript php build issues with MSVC (#4004)

Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2011-08-25 14:01:48 UTC (rev 12112)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2011-08-25 14:02:51 UTC (rev 12113)
@@ -15,6 +15,8 @@
 Current Version (future 6.0.2, SVN branch-6-0):
 ---------------------------
 
+- Fix mapscript php build issues with MSVC (#4004)
+
 - PHP/Mapscript: Segmentation fault when getting complex object using PHP 5.2 (#3930)
 
 - Fixed contains operator in logical expresions (#3974)

Modified: branches/branch-6-0/mapserver/mapscript/php/Makefile.vc
===================================================================
--- branches/branch-6-0/mapserver/mapscript/php/Makefile.vc	2011-08-25 14:01:48 UTC (rev 12112)
+++ branches/branch-6-0/mapserver/mapscript/php/Makefile.vc	2011-08-25 14:02:51 UTC (rev 12113)
@@ -30,8 +30,12 @@
 # Set flag for Visual Studio > 2003 & PHP < 5.3
 # see http://bugs.php.net/bug.php?id=39130
 !IF $(MSVC_VER) >= 1400
-VCFLAGS = -D_USE_32BIT_TIME_T
+!IFDEF WIN64
+VCFLAGS = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
+!ELSE
+VCFLAGS = -D_USE_32BIT_TIME_T -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
 !ENDIF
+!ENDIF
 
 BASE_CFLAGS = 	$(OPTFLAGS) -DWIN32 -D_WIN32 $(PHP4_FLAGS) $(VCFLAGS)
 OPTFLAGS = /nologo /Zi /MD $(WARNING_LEVEL) $(DEBUG) /EHsc
@@ -78,12 +82,13 @@
 $(PHPMS_DLL):	$(PHPMS_OBJS)
 	link $(LDFLAGS) /out:$(PHPMS_DLL) $(PHPMS_OBJS) $(MS_LIBS) \
 		$(PHP_HOME)\lib\$(PHP_TS_LIB_NAME)
+    if exist $(PHPMS_DLL).manifest mt -manifest $(PHPMS_DLL).manifest -outputresource:$(PHPMS_DLL);2
 
 $(PHPPROJ_DLL):	$(PHPPROJ_OBJS)
 	link $(LDFLAGS) /out:$(PHPPROJ_DLL) $(PHPPROJ_OBJS) $(MS_LIBS) \
 		$(PHP_HOME)\lib\$(PHP_TS_LIB_NAME)
 
-$(PHPMS_OBJS):	php_mapscript_util.h php_mapscript.h $(MS_LIBS)
+$(PHPMS_OBJS):	php_mapscript_util.h php_mapscript.h
 
 .c.obj:
 	$(CC) $(CFLAGS) /DCOMPILE_DL=1 /c $*.c /Fo$*.obj
@@ -99,4 +104,4 @@
 	del *.pdb
 	del *.exp
 	del *.ilk
-
+    del *.manifest