[mapserver-commits] r7384 - trunk/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2008-02-15 16:54:08 -0500 (Fri, 15 Feb 2008)
New Revision: 7384

Modified:
   trunk/mapserver/Makefile.vc
   trunk/mapserver/nmake.opt
Log:
Correct the SDE version issue and embed the manifest to the plugin dll-s

Modified: trunk/mapserver/Makefile.vc
===================================================================
--- trunk/mapserver/Makefile.vc	2008-02-14 15:02:58 UTC (rev 7383)
+++ trunk/mapserver/Makefile.vc	2008-02-15 21:54:08 UTC (rev 7384)
@@ -209,10 +209,17 @@
 !ENDIF
 
 !IFDEF SDE_OPT
+!IF $(SDE_VERSION) >= 92
+SDE_LIB = $(SDE_DIR)\lib\pe.lib \
+          $(SDE_DIR)\lib\sde.lib \
+          $(SDE_DIR)\lib\sg.lib    
+!ELSE
 SDE_LIB = $(SDE_DIR)\lib\pe$(SDE_VERSION).lib \
           $(SDE_DIR)\lib\sde$(SDE_VERSION).lib \
           $(SDE_DIR)\lib\sg$(SDE_VERSION).lib    
 !ENDIF
+!ENDIF
+
 plugins:  
 		-del mapsde.obj
 		-del maporaclespatial.obj
@@ -221,16 +228,19 @@
 !IFDEF SDE_OPT
 	$(CC) $(CFLAGS) -DUSE_SDE /c mapsde.c /Fomapsde.obj
     link /dll /out:msplugin_sde_$(SDE_VERSION).dll mapsde.obj mapthread.obj mapserver_i.lib $(SDE_LIB)
+    if exist msplugin_sde_$(SDE_VERSION).dll.manifest mt -manifest msplugin_sde_$(SDE_VERSION).dll.manifest -outputresource:msplugin_sde_$(SDE_VERSION).dll;2
 	-del mapsde.obj
 !ENDIF
 !IFDEF ORACLE
 	$(CC) $(CFLAGS) -DUSE_ORACLESPATIAL /c maporaclespatial.c /Fomaporaclespatial.obj
     link /dll /out:msplugin_oracle.dll maporaclespatial.obj $(ORACLE_LIB) mapserver_i.lib
+    if exist msplugin_oracle.dll.manifest mt -manifest msplugin_oracle.dll.manifest -outputresource:msplugin_oracle.dll;2
     -del maporaclespatial.obj
 !ENDIF
 !IFDEF MSSQL2008
 	$(CC) $(CFLAGS) $(ODBC_INC) -DUSE_MSSQL2008 /c mapmssql2008.c /Fomapmssql2008.obj
     link /dll /out:msplugin_mssql2008.dll mapmssql2008.obj $(ODBC_LIBS) mapserver_i.lib
+    if exist msplugin_mssql2008.dll.manifest mt -manifest msplugin_mssql2008.dll.manifest -outputresource:msplugin_mssql2008.dll;2
     -del mapmssql2008.obj
 !ENDIF
 

Modified: trunk/mapserver/nmake.opt
===================================================================
--- trunk/mapserver/nmake.opt	2008-02-14 15:02:58 UTC (rev 7383)
+++ trunk/mapserver/nmake.opt	2008-02-15 21:54:08 UTC (rev 7384)
@@ -424,6 +424,7 @@
 # libs and includes must be set to be able to build the plugin.
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+#MSSQL2008 = YES
 #ODBC_DIR="C:\progra~1\micros~1.net\vc7\platformsdk"
 #ODBC_LIBS=$(ODBC_DIR)\lib\odbc32.lib $(ODBC_DIR)\lib\odbccp32.lib $(ODBC_DIR)\lib\user32.lib
 #ODBC_INC=-I"C:\progra~1\micros~1.net\vc7\platformsdk\include"