[Mobies-commit] [commit] r3705 - in UDM/trunk/src/UIntWizVS: Scripts/1033 Templates/1033

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Mon May  2 11:00:04 2011
New Revision: 3705

Log:
Compat with GME11

Deleted:
   UDM/trunk/src/UIntWizVS/Templates/1033/ComponentObj.cpp
   UDM/trunk/src/UIntWizVS/Templates/1033/ComponentObj.h
Modified:
   UDM/trunk/src/UIntWizVS/Scripts/1033/default.js
   UDM/trunk/src/UIntWizVS/Templates/1033/Common.inf
   UDM/trunk/src/UIntWizVS/Templates/1033/Templates.inf

Modified: UDM/trunk/src/UIntWizVS/Scripts/1033/default.js
==============================================================================
--- UDM/trunk/src/UIntWizVS/Scripts/1033/default.js	Mon May  2 10:19:24 2011	(r3704)
+++ UDM/trunk/src/UIntWizVS/Scripts/1033/default.js	Mon May  2 11:00:04 2011	(r3705)
@@ -198,12 +198,13 @@
 		    MIDLTool.MkTypLibCompatible="false";
 		    MIDLTool.ValidateParameters="true";
 		    MIDLTool.TypeLibraryName = ".\\ComponentLib.tlb";
-		    MIDLTool.AdditionalIncludeDirectories = ".;$(GME_ROOT)/Interfaces;$(GME_ROOT)/Gme/Interfaces";
+		    MIDLTool.HeaderFileName = "$(InputName).h"
+		    MIDLTool.AdditionalIncludeDirectories = ".;$(GME_ROOT)/Interfaces;$(GME_ROOT)/Gme/Interfaces;$(GME_ROOT)/bin;$(GME_ROOT)/Gme/Release;$(GME_ROOT)/Gme/Debug";
             
             // DEBUG COMPILER SETTINGS
 		    var CLTool = config.Tools('VCCLCompilerTool');
 		    CLTool.Optimization = optimizeOption.optimizeDisabled;
-		    CLTool.AdditionalIncludeDirectories = ".;$(GME_ROOT)/SDK/BON/Common;$(UDM_PATH)/include";
+		    CLTool.AdditionalIncludeDirectories = ".;$(GME_ROOT)/SDK/BON/Common;$(UDM_PATH)/include;$(GME_ROOT)/Interfaces;$(GME_ROOT)/Gme/Interfaces";
 		    CLTool.PreprocessorDefinitions = "WIN32;_DEBUG;_WINDOWS;_USRDLL";
 		    CLTool.BasicRuntimeChecks = basicRuntimeCheckOption.runtimeBasicCheckAll;
 		    CLTool.RuntimeLibrary = runtimeLibraryOption.rtMultiThreadedDebugDLL;
@@ -238,7 +239,6 @@
             if(wizard.FindSymbol("UDM_LINKING_DYNAMIC"))
             {
                 CLTool.PreprocessorDefinitions += ";UDM_DYNAMIC_LINKING";
-                LinkTool.AdditionalDependencies = "UdmDlld.lib";
                 LinkTool.AdditionalLibraryDirectories = ".;$(UDM_PATH)/lib";
                 LinkTool.OutputFile = "$(OutDir)/$(ProjectName)d.dll"                   
             }	    
@@ -266,12 +266,13 @@
 		    MIDLTool.MkTypLibCompatible = "false";
 		    MIDLTool.ValidateParameters = "true";
 		    MIDLTool.TypeLibraryName = ".\\ComponentLib.tlb";
-		    MIDLTool.AdditionalIncludeDirectories = ".;$(GME_ROOT)/Interfaces;$(GME_ROOT)/Gme/Interfaces";
+		    MIDLTool.HeaderFileName = "$(InputName).h"
+		    MIDLTool.AdditionalIncludeDirectories = ".;$(GME_ROOT)/Interfaces;$(GME_ROOT)/Gme/Interfaces;$(GME_ROOT)/bin;$(GME_ROOT)/Gme/Release;$(GME_ROOT)/Gme/Debug";
     		
 		    // RELEASE COMPILER SETTINGS
 		    var CLTool = config.Tools('VCCLCompilerTool');
 		    CLTool.Optimization = optimizeOption.optimizeMaxSpeed;
-		    CLTool.AdditionalIncludeDirectories = ".;$(GME_ROOT)/SDK/BON/Common;$(UDM_PATH)/include";
+		    CLTool.AdditionalIncludeDirectories = ".;$(GME_ROOT)/SDK/BON/Common;$(UDM_PATH)/include;$(GME_ROOT)/Interfaces;$(GME_ROOT)/Gme/Interfaces";
 		    CLTool.PreprocessorDefinitions = "WIN32;NDEBUG;_WINDOWS;_USRDLL";
 		    CLTool.RuntimeLibrary = runtimeLibraryOption.rtMultiThreadedDLL;
 		    CLTool.TreatWChar_tAsBuiltInType = "true";
@@ -306,7 +307,6 @@
             {
                    // RELEASE UDM SETTINGS
                 CLTool.PreprocessorDefinitions += ";UDM_DYNAMIC_LINKING";
-                LinkTool.AdditionalDependencies = "UdmDll.lib";
                 LinkTool.AdditionalLibraryDirectories = ".;$(UDM_PATH)/lib";
                 LinkTool.OutputFile = "$(OutDir)/$(ProjectName).dll"                   
             }	    

Modified: UDM/trunk/src/UIntWizVS/Templates/1033/Common.inf
==============================================================================
--- UDM/trunk/src/UIntWizVS/Templates/1033/Common.inf	Mon May  2 10:19:24 2011	(r3704)
+++ UDM/trunk/src/UIntWizVS/Templates/1033/Common.inf	Mon May  2 11:00:04 2011	(r3705)
@@ -2,6 +2,8 @@
 ComHelp.cpp
 ComponentDll.h
 ComponentDll.cpp
+ComponentObj.h
+ComponentObj.cpp
 ComponentLib.idl
 GMECOM.H
 targetver.h

Modified: UDM/trunk/src/UIntWizVS/Templates/1033/Templates.inf
==============================================================================
--- UDM/trunk/src/UIntWizVS/Templates/1033/Templates.inf	Mon May  2 10:19:24 2011	(r3704)
+++ UDM/trunk/src/UIntWizVS/Templates/1033/Templates.inf	Mon May  2 11:00:04 2011	(r3705)
@@ -10,8 +10,6 @@
 [!endif]
 RawComponent.cpp
 RawComponent.h
-ComponentObj.h
-ComponentObj.cpp
 CompIcon.ico
 Component.def
 Component.rc