diff --git a/ChangeLog b/ChangeLog index 425b0f4df..f06c9284d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-09-17 Holger Vogt + * visualc/include/config.h, vngspice.sln, vngspice.vcproj: + new configurations release, Debug, and ReleaseOMP + 2010-09-17 Robert Larice * .cvsignore , * Makefile.am , diff --git a/visualc/include/config.h b/visualc/include/config.h index 0bf46f63c..5c458d3ae 100644 --- a/visualc/include/config.h +++ b/visualc/include/config.h @@ -444,14 +444,20 @@ /* Do not trigger unwanted traps by default */ /* #undef NEWTRUNC */ -/* Define the directory for executables */ -#define NGSPICEBINDIR "C:/Spice/bin" - /* Define the build date */ #define NGSPICEBUILDDATE "Mon Sep 06 23:06:55 GMT 2010" +#ifdef CONFIG64 +/* Define the directory for executables */ +#define NGSPICEBINDIR "C:/Spice64/bin" +/* Define the directory for architecture independent data files */ +#define NGSPICEDATADIR "C:/Spice64/share/ngspice" +#else +/* Define the directory for executables */ +#define NGSPICEBINDIR "C:/Spice/bin" /* Define the directory for architecture independent data files */ #define NGSPICEDATADIR "C:/Spice/share/ngspice" +#endif /* Define if we want NOBYPASS */ /* #undef NOBYPASS */ diff --git a/visualc/vngspice.sln b/visualc/vngspice.sln index 09d8993fc..92e8134ee 100644 --- a/visualc/vngspice.sln +++ b/visualc/vngspice.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vngspice", "vngspice.vcproj", "{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}" @@ -13,8 +12,8 @@ Global Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 - release64|Win32 = release64|Win32 - release64|x64 = release64|x64 + ReleaseOMP|Win32 = ReleaseOMP|Win32 + ReleaseOMP|x64 = ReleaseOMP|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_debug|Win32.ActiveCfg = console_debug|Win32 @@ -33,15 +32,12 @@ Global {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Release|Win32.Build.0 = Release|Win32 {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Release|x64.ActiveCfg = Release|x64 {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Release|x64.Build.0 = Release|x64 - {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.release64|Win32.ActiveCfg = release64|Win32 - {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.release64|Win32.Build.0 = release64|Win32 - {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.release64|x64.ActiveCfg = release64|x64 - {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.release64|x64.Build.0 = release64|x64 + {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP|Win32.ActiveCfg = ReleaseOMP|Win32 + {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP|Win32.Build.0 = ReleaseOMP|Win32 + {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP|x64.ActiveCfg = ReleaseOMP|x64 + {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP|x64.Build.0 = ReleaseOMP|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - AMDCaProjectFile = D:\Spice_general\ng-spice-rework\visualc\CodeAnalyst\vngspice.caw - EndGlobalSection EndGlobal diff --git a/visualc/vngspice.vcproj b/visualc/vngspice.vcproj index cbc479627..ef8e378dd 100644 --- a/visualc/vngspice.vcproj +++ b/visualc/vngspice.vcproj @@ -141,7 +141,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)..\src\maths\poly";"$(ProjectDir)..\src\frontend";"$(ProjectDir)..\src\spicelib\devices";"$(ProjectDir)..\src\include";"$(ProjectDir)include"" - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;SIMULATOR;NGDEBUG" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;SIMULATOR;NGDEBUG;CONFIG64" MinimalRebuild="true" ExceptionHandling="0" BasicRuntimeChecks="0" @@ -165,7 +165,7 @@