spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade code for 64-bit build in Visual Studio. 

This updates the code to build for an x64 target.
- Provide prebuilt x64 static libraries.
- Update Windows dialog code for 64-bit support.
- Update libpng to 1.6.29.

Still a few issues:
- Sound (fmod) isn't working correctly in 64-bit.
pull/110/head
Dmitry Brant 2017-04-08 16:51:31 -04:00 committed by Hleb Valoshka
parent a2e79dcd05
commit ff2455857a
60 changed files with 9924 additions and 6011 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
celestia.sln
View File

@ -1,20 +1,32 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26228.9
VisualStudioVersion = 15.0.26403.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "celestia", "celestia.vcxproj", "{DDDE8EA8-F55A-491B-A102-11C9C01B4B58}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
Release64|Win32 = Release64|Win32
Release64|x64 = Release64|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DDDE8EA8-F55A-491B-A102-11C9C01B4B58}.Debug|Win32.ActiveCfg = Debug|Win32
{DDDE8EA8-F55A-491B-A102-11C9C01B4B58}.Debug|Win32.Build.0 = Debug|Win32
{DDDE8EA8-F55A-491B-A102-11C9C01B4B58}.Debug|x64.ActiveCfg = Debug|x64
{DDDE8EA8-F55A-491B-A102-11C9C01B4B58}.Debug|x64.Build.0 = Debug|x64
{DDDE8EA8-F55A-491B-A102-11C9C01B4B58}.Release|Win32.ActiveCfg = Release|Win32
{DDDE8EA8-F55A-491B-A102-11C9C01B4B58}.Release|Win32.Build.0 = Release|Win32
{DDDE8EA8-F55A-491B-A102-11C9C01B4B58}.Release|x64.ActiveCfg = Release|x64
{DDDE8EA8-F55A-491B-A102-11C9C01B4B58}.Release|x64.Build.0 = Release|x64
{DDDE8EA8-F55A-491B-A102-11C9C01B4B58}.Release64|Win32.ActiveCfg = Release64|x64
{DDDE8EA8-F55A-491B-A102-11C9C01B4B58}.Release64|Win32.Build.0 = Release64|Win32
{DDDE8EA8-F55A-491B-A102-11C9C01B4B58}.Release64|x64.ActiveCfg = Release64|x64
{DDDE8EA8-F55A-491B-A102-11C9C01B4B58}.Release64|x64.Build.0 = Release64|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

156
celestia.vcxproj
View File

@ -9,6 +9,14 @@
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release64|Win32">
<Configuration>Release64</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release64|x64">
<Configuration>Release64</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@ -27,6 +35,10 @@
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release64|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
@ -35,6 +47,10 @@
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
@ -45,12 +61,18 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release64|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
@ -66,26 +88,38 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release64|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>.\src;.\windows\inc;.\windows\inc\libintl;.\windows\inc\libpng;.\windows\inc\libz;.\windows\inc\spice;.\windows\inc\lua-5.1;.\windows\inc\libjpeg;.\thirdparty\Eigen;.\thirdparty\glew\include;.\thirdparty\curveplot\include;.\windows\inc\fmod;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CELX;LUA_VER=0x050100;USE_SPICE;WINVER=0x0400;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\src;.\windows\inc;.\windows\inc\libintl;.\windows\inc\libjpeg;.\windows\inc\libpng;.\windows\inc\libz;.\windows\inc\lua;.\windows\inc\spice;.\thirdparty\Eigen;.\thirdparty\glew\include;.\thirdparty\curveplot\include;.\windows\inc\fmod;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>LIBINTL_STATIC;CELX;LUA_VER=0x050100;USE_SPICE;WINVER=0x0400;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>intl.lib;user32.lib;gdi32.lib;comdlg32.lib;comctl32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;winmm.lib;vfw32.lib;opengl32.lib;glu32.lib;libjpeg.lib;zlibd.lib;libpngd.lib;lua5.1.lib;cspice.lib;fmod_vc.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(ProjectName).exe</OutputFile>
<AdditionalDependencies>legacy_stdio_definitions.lib;user32.lib;gdi32.lib;comdlg32.lib;comctl32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;winmm.lib;vfw32.lib;opengl32.lib;glu32.lib;libintl.lib;libiconv.lib;libjpeg.lib;zlib.lib;libpng.lib;lua51.lib;cspice.lib;fmod_vc.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)$(Configuration)\$(ProjectName).exe</OutputFile>
<AdditionalLibraryDirectories>.\windows\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -100,20 +134,21 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>.\src;.\windows\inc;.\windows\inc\libintl;.\windows\inc\libpng;.\windows\inc\libz;.\windows\inc\spice;.\windows\inc\lua-5.1;.\windows\inc\libjpeg;.\thirdparty\Eigen;.\thirdparty\glew\include;.\thirdparty\curveplot\include;.\windows\inc\fmod;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CELX;LUA_VER=0x050100;USE_SPICE;WINVER=0x0400;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\src;.\windows\inc;.\windows\inc\libintl;.\windows\inc\libjpeg;.\windows\inc\libpng;.\windows\inc\libz;.\windows\inc\lua;.\windows\inc\spice;.\thirdparty\Eigen;.\thirdparty\glew\include;.\thirdparty\curveplot\include;.\windows\inc\fmod;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>LIBINTL_STATIC;CELX;LUA_VER=0x050100;USE_SPICE;WINVER=0x0400;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>intl.lib;user32.lib;gdi32.lib;comdlg32.lib;comctl32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;winmm.lib;vfw32.lib;opengl32.lib;glu32.lib;libjpeg.lib;zlibd.lib;libpngd.lib;lua5.1.lib;cspice.lib;fmod_vc.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(ProjectName).exe</OutputFile>
<AdditionalLibraryDirectories>.\windows\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;comctl32.lib;winmm.lib;vfw32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;glu32.lib;libintl.lib;libiconv.lib;libjpeg.lib;zlib.lib;libpng.lib;lua51.lib;cspice64.lib;fmod64_vc.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName).exe</OutputFile>
<AdditionalLibraryDirectories>.\windows\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention />
<TargetMachine>MachineX64</TargetMachine>
<ManifestFile>$(SolutionDir)\src\celestia\win32\res\celestia.exe.manifest</ManifestFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -121,8 +156,30 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>.\src;.\windows\inc;.\windows\inc\libintl;.\windows\inc\libpng;.\windows\inc\libz;.\windows\inc\spice;.\windows\lua51\include;.\windows\inc\libjpeg;.\thirdparty\Eigen;.\thirdparty\curveplot\include;.\thirdparty\glew\include;.\windows\inc\fmod;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CELX;LUA_VER=0x050100;USE_SPICE;WINVER=0x0400;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;EIGEN_NO_DEBUG;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\src;.\windows\inc;.\windows\inc\libintl;.\windows\inc\libjpeg;.\windows\inc\libpng;.\windows\inc\libz;.\windows\inc\lua;.\windows\inc\spice;.\thirdparty\Eigen;.\thirdparty\glew\include;.\thirdparty\curveplot\include;.\windows\inc\fmod;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>LIBINTL_STATIC;CELX;LUA_VER=0x050100;USE_SPICE;WINVER=0x0400;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;EIGEN_NO_DEBUG;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
</ClCompile>
<Link>
<AdditionalDependencies>legacy_stdio_definitions.lib;user32.lib;gdi32.lib;comdlg32.lib;comctl32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;winmm.lib;vfw32.lib;opengl32.lib;glu32.lib;libintl.lib;libiconv.lib;libjpeg.lib;zlib.lib;libpng.lib;lua51.lib;cspice.lib;fmod_vc.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)$(Configuration)\$(ProjectName).exe</OutputFile>
<AdditionalLibraryDirectories>.\windows\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<ManifestFile>$(SolutionDir)\src\celestia\win32\res\celestia.exe.manifest</ManifestFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release64|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>.\src;.\windows\inc;.\windows\inc\libintl;.\windows\inc\libjpeg;.\windows\inc\libpng;.\windows\inc\libz;.\windows\inc\lua;.\windows\inc\spice;.\thirdparty\Eigen;.\thirdparty\glew\include;.\thirdparty\curveplot\include;.\windows\inc\fmod;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>LIBINTL_STATIC;CELX;LUA_VER=0x050100;USE_SPICE;WINVER=0x0400;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;EIGEN_NO_DEBUG;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
@ -133,7 +190,8 @@
<AdditionalLibraryDirectories>.\windows\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention />
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ManifestFile>$(SolutionDir)\src\celestia\win32\res\celestia.exe.manifest</ManifestFile>
</Link>
@ -146,20 +204,47 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>.\src;.\windows\inc;.\windows\inc\libintl;.\windows\inc\libpng;.\windows\inc\libz;.\windows\inc\spice;.\windows\inc\lua-5.1;.\windows\inc\libjpeg;.\thirdparty\Eigen;.\thirdparty\curveplot\include;.\thirdparty\glew\include;.\windows\inc\fmod;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CELX;LUA_VER=0x050100;USE_SPICE;WINVER=0x0400;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;EIGEN_NO_DEBUG;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\src;.\windows\inc;.\windows\inc\libintl;.\windows\inc\libjpeg;.\windows\inc\libpng;.\windows\inc\libz;.\windows\inc\lua;.\windows\inc\spice;.\thirdparty\Eigen;.\thirdparty\glew\include;.\thirdparty\curveplot\include;.\windows\inc\fmod;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>LIBINTL_STATIC;CELX;LUA_VER=0x050100;USE_SPICE;WINVER=0x0400;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;EIGEN_NO_DEBUG;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
</ClCompile>
<Link>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;comctl32.lib;winmm.lib;vfw32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;glu32.lib;libintl.lib;libiconv.lib;libjpeg.lib;zlib.lib;libpng.lib;lua51.lib;cspice64.lib;fmod64_vc.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName).exe</OutputFile>
<AdditionalLibraryDirectories>.\windows\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention />
<TargetMachine>MachineX64</TargetMachine>
<ManifestFile>$(SolutionDir)\src\celestia\win32\res\celestia.exe.manifest</ManifestFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>.\src;.\windows\inc;.\windows\inc\libintl;.\windows\inc\libjpeg;.\windows\inc\libpng;.\windows\inc\libz;.\windows\inc\lua;.\windows\inc\spice;.\thirdparty\Eigen;.\thirdparty\glew\include;.\thirdparty\curveplot\include;.\windows\inc\fmod;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>LIBINTL_STATIC;CELX;LUA_VER=0x050100;USE_SPICE;WINVER=0x0400;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;EIGEN_NO_DEBUG;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
</ClCompile>
<Link>
<AdditionalDependencies>intl.lib;user32.lib;gdi32.lib;comdlg32.lib;comctl32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;winmm.lib;vfw32.lib;opengl32.lib;glu32.lib;libjpeg.lib;zlib.lib;libpng.lib;lua5.1.lib;cspice.lib;fmod_vc.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(ProjectName).exe</OutputFile>
<AdditionalLibraryDirectories>.\windows\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;comctl32.lib;winmm.lib;vfw32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;glu32.lib;libintl.lib;libiconv.lib;libjpeg.lib;zlib.lib;libpng.lib;lua51.lib;cspice64.lib;fmod64_vc.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName).exe</OutputFile>
<AdditionalLibraryDirectories>.\windows\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention />
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
<ManifestFile>$(SolutionDir)\src\celestia\win32\res\celestia.exe.manifest</ManifestFile>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@ -266,6 +351,7 @@
<ClCompile Include="src\celestia\imagecapture.cpp" />
<ClCompile Include="src\celestia\scriptmenu.cpp" />
<ClCompile Include="src\celestia\url.cpp" />
<ClCompile Include="src\celestia\win32\iob_func_shim.cpp" />
<ClCompile Include="src\celestia\win32\ODMenu.cpp" />
<ClCompile Include="src\celestia\win32\wglext.cpp" />
<ClCompile Include="src\celestia\win32\winbookmarks.cpp" />
@ -301,36 +387,6 @@
<ClCompile Include="src\celutil\winutil.cpp" />
<ClCompile Include="thirdparty\curveplot\src\curveplot.cpp" />
<ClCompile Include="thirdparty\glew\src\glew.c" />
<ClCompile Include="windows\lua51\src\lapi.c" />
<ClCompile Include="windows\lua51\src\lauxlib.c" />
<ClCompile Include="windows\lua51\src\lbaselib.c" />
<ClCompile Include="windows\lua51\src\lcode.c" />
<ClCompile Include="windows\lua51\src\ldblib.c" />
<ClCompile Include="windows\lua51\src\ldebug.c" />
<ClCompile Include="windows\lua51\src\ldo.c" />
<ClCompile Include="windows\lua51\src\ldump.c" />
<ClCompile Include="windows\lua51\src\lfunc.c" />
<ClCompile Include="windows\lua51\src\lgc.c" />
<ClCompile Include="windows\lua51\src\linit.c" />
<ClCompile Include="windows\lua51\src\liolib.c" />
<ClCompile Include="windows\lua51\src\llex.c" />
<ClCompile Include="windows\lua51\src\lmathlib.c" />
<ClCompile Include="windows\lua51\src\lmem.c" />
<ClCompile Include="windows\lua51\src\loadlib.c" />
<ClCompile Include="windows\lua51\src\lobject.c" />
<ClCompile Include="windows\lua51\src\lopcodes.c" />
<ClCompile Include="windows\lua51\src\loslib.c" />
<ClCompile Include="windows\lua51\src\lparser.c" />
<ClCompile Include="windows\lua51\src\lstate.c" />
<ClCompile Include="windows\lua51\src\lstring.c" />
<ClCompile Include="windows\lua51\src\lstrlib.c" />
<ClCompile Include="windows\lua51\src\ltable.c" />
<ClCompile Include="windows\lua51\src\ltablib.c" />
<ClCompile Include="windows\lua51\src\ltm.c" />
<ClCompile Include="windows\lua51\src\lundump.c" />
<ClCompile Include="windows\lua51\src\lvm.c" />
<ClCompile Include="windows\lua51\src\lzio.c" />
<ClCompile Include="windows\lua51\src\print.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\cel3ds\3dschunk.h" />
@ -563,7 +619,9 @@
<None Include="src\celestia\win32\res\crosshair.cur" />
</ItemGroup>
<ItemGroup>
<Manifest Include="src\celestia\win32\res\celestia.exe.manifest" />
<Manifest Include="src\celestia\win32\res\celestia.exe.manifest">
<SubType>Designer</SubType>
</Manifest>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

94
celestia.vcxproj.filters
View File

@ -73,9 +73,6 @@
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
</Filter>
<Filter Include="lua51">
<UniqueIdentifier>{6e1958e1-b3ce-47fc-b882-18c7b555d20a}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\celmath\frustum.cpp">
@ -492,95 +489,8 @@
<ClCompile Include="src\celmodel\modelfile.cpp">
<Filter>Source Files\celmodel</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\lbaselib.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\lcode.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\ldblib.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\ldebug.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\ldo.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\ldump.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\lfunc.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\lgc.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\linit.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\liolib.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\llex.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\lmathlib.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\lmem.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\loadlib.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\lobject.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\lopcodes.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\loslib.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\lparser.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\lstate.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\lstring.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\lstrlib.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\ltable.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\ltablib.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\ltm.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\lundump.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\lvm.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\lzio.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\print.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\lapi.c">
<Filter>lua51</Filter>
</ClCompile>
<ClCompile Include="windows\lua51\src\lauxlib.c">
<Filter>lua51</Filter>
<ClCompile Include="src\celestia\win32\iob_func_shim.cpp">
<Filter>Source Files\win32ui</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>

3
src/celestia/celestiacore.cpp
View File

@ -4461,6 +4461,9 @@ bool CelestiaCore::initRenderer()
detailOptions.orbitPathSamplePoints = config->orbitPathSamplePoints;
detailOptions.shadowTextureSize = config->shadowTextureSize;
detailOptions.eclipseTextureSize = config->eclipseTextureSize;
detailOptions.orbitWindowEnd = config->orbitWindowEnd;
detailOptions.orbitPeriodsShown = config->orbitPeriodsShown;
detailOptions.linearFadeFraction = config->linearFadeFraction;
// Prepare the scene for rendering.
if (!renderer->init(context, (int) width, (int) height, detailOptions))

2
src/celestia/win32/res/celestia.exe.manifest
View File

@ -13,7 +13,7 @@
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="X86"
processorArchitecture="*"
publicKeyToken="6595b64144ccf1df"
language="*"
/>

17
src/celestia/win32/wineclipses.cpp
View File

@ -293,10 +293,11 @@ BOOL APIENTRY EclipseListViewProc(HWND hWnd,
BOOL APIENTRY EclipseFinderProc(HWND hDlg,
UINT message,
UINT wParam,
LONG lParam)
WPARAM wParam,
LPARAM lParam)
{
EclipseFinderDialog* eclipseFinderDlg = reinterpret_cast<EclipseFinderDialog*>(GetWindowLong(hDlg, DWL_USER));
//EclipseFinderDialog* eclipseFinderDlg = reinterpret_cast<EclipseFinderDialog*>(GetWindowLong(hDlg, DWL_USER));
EclipseFinderDialog* eclipseFinderDlg = reinterpret_cast<EclipseFinderDialog*>(GetWindowLongPtr(hDlg, DWLP_USER));
switch (message)
{
@ -305,7 +306,8 @@ BOOL APIENTRY EclipseFinderProc(HWND hDlg,
EclipseFinderDialog* efd = reinterpret_cast<EclipseFinderDialog*>(lParam);
if (efd == NULL)
return EndDialog(hDlg, 0);
SetWindowLong(hDlg, DWL_USER, lParam);
//SetWindowLong(hDlg, DWL_USER, lParam);
SetWindowLongPtr(hDlg, DWLP_USER, lParam);
HWND hwnd = GetDlgItem(hDlg, IDC_ECLIPSES_LIST);
InitEclipseFinderColumns(hwnd);
SendDlgItemMessage(hDlg, IDC_ECLIPSES_LIST, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT);
@ -329,7 +331,8 @@ BOOL APIENTRY EclipseFinderProc(HWND hDlg,
// Subclass the ListView to intercept WM_LBUTTONUP messages
HWND hCtrl;
if (hCtrl = GetDlgItem(hDlg, IDC_ECLIPSES_LIST))
oldListViewProc = (WNDPROC) SetWindowLong(hCtrl, GWL_WNDPROC, (DWORD) EclipseListViewProc);
oldListViewProc = (WNDPROC)SetWindowLongPtr(hCtrl, GWLP_WNDPROC, (LPARAM)EclipseListViewProc);
//oldListViewProc = (WNDPROC) SetWindowLong(hCtrl, GWL_WNDPROC, (DWORD) EclipseListViewProc);
}
return(TRUE);
@ -518,6 +521,6 @@ EclipseFinderDialog::EclipseFinderDialog(HINSTANCE appInstance,
hwnd = CreateDialogParam(appInstance,
MAKEINTRESOURCE(IDD_ECLIPSEFINDER),
parent,
EclipseFinderProc,
reinterpret_cast<LONG>(this));
(DLGPROC)EclipseFinderProc,
reinterpret_cast<LPARAM>(this));
}

12
src/celestia/win32/wingotodlg.cpp
View File

@ -42,10 +42,10 @@ static bool SetDialogFloat(HWND hDlg, int id, char* format, float f)
static BOOL APIENTRY GotoObjectProc(HWND hDlg,
UINT message,
UINT wParam,
LONG lParam)
WPARAM wParam,
LPARAM lParam)
{
GotoObjectDialog* gotoDlg = reinterpret_cast<GotoObjectDialog*>(GetWindowLong(hDlg, DWL_USER));
GotoObjectDialog* gotoDlg = reinterpret_cast<GotoObjectDialog*>(GetWindowLongPtr(hDlg, DWLP_USER));
switch (message)
{
@ -54,7 +54,7 @@ static BOOL APIENTRY GotoObjectProc(HWND hDlg,
GotoObjectDialog* gotoDlg = reinterpret_cast<GotoObjectDialog*>(lParam);
if (gotoDlg == NULL)
return EndDialog(hDlg, 0);
SetWindowLong(hDlg, DWL_USER, lParam);
SetWindowLongPtr(hDlg, DWLP_USER, lParam);
CheckRadioButton(hDlg,
IDC_RADIO_KM, IDC_RADIO_RADII,
IDC_RADIO_KM);
@ -172,6 +172,6 @@ GotoObjectDialog::GotoObjectDialog(HINSTANCE appInstance,
hwnd = CreateDialogParam(appInstance,
MAKEINTRESOURCE(IDD_GOTO_OBJECT),
parent,
GotoObjectProc,
reinterpret_cast<LONG>(this));
(DLGPROC)GotoObjectProc,
reinterpret_cast<LPARAM>(this));
}

12
src/celestia/win32/winhyperlinks.cpp
View File

@ -76,7 +76,7 @@ LRESULT CALLBACK _HyperlinkParentProc(HWND hWnd, UINT message, WPARAM wParam, LP
}
case WM_DESTROY:
{
SetWindowLong(hWnd, GWL_WNDPROC, (LONG)origProc);
SetWindowLongPtr(hWnd, GWLP_WNDPROC, (LONG_PTR)origProc);
RemoveProp(hWnd, hyperLinkOriginalProc);
break;
}
@ -131,7 +131,7 @@ LRESULT CALLBACK _HyperlinkProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l
}
case WM_DESTROY:
{
SetWindowLong(hWnd, GWL_WNDPROC, (LONG)origProc);
SetWindowLongPtr(hWnd, GWLP_WNDPROC, (LONG_PTR)origProc);
RemoveProp(hWnd, hyperLinkOriginalProc);
HFONT hOrigFont = (HFONT)GetProp(hWnd, hyperLinkOriginalFont);
@ -162,11 +162,11 @@ BOOL MakeHyperlinkFromStaticCtrl(HWND hDlg, UINT ctrlID)
HWND hParent = GetParent(hCtrl);
if (hParent)
{
WNDPROC origProc = (WNDPROC)GetWindowLong(hParent, GWL_WNDPROC);
WNDPROC origProc = (WNDPROC)GetWindowLongPtr(hParent, GWLP_WNDPROC);
if (origProc != _HyperlinkParentProc)
{
SetProp(hParent, hyperLinkOriginalProc, (HANDLE)origProc);
SetWindowLong(hParent, GWL_WNDPROC, (LONG)(WNDPROC)_HyperlinkParentProc);
SetWindowLong(hParent, GWLP_WNDPROC, (LONG_PTR)(WNDPROC)_HyperlinkParentProc);
}
}
@ -175,9 +175,9 @@ BOOL MakeHyperlinkFromStaticCtrl(HWND hDlg, UINT ctrlID)
SetWindowLong(hCtrl, GWL_STYLE, dwStyle | SS_NOTIFY);
// Subclass the existing control.
WNDPROC origProc = (WNDPROC)GetWindowLong(hCtrl, GWL_WNDPROC);
WNDPROC origProc = (WNDPROC)GetWindowLongPtr(hCtrl, GWLP_WNDPROC);
SetProp(hCtrl, hyperLinkOriginalProc, (HANDLE)origProc);
SetWindowLong(hCtrl, GWL_WNDPROC, (LONG)(WNDPROC)_HyperlinkProc);
SetWindowLong(hCtrl, GWLP_WNDPROC, (LONG_PTR)(WNDPROC)_HyperlinkProc);
// Create an updated font by adding an underline.
HFONT hOrigFont = (HFONT) SendMessage(hCtrl, WM_GETFONT, 0, 0);

12
src/celestia/win32/winlocations.cpp
View File

@ -31,10 +31,10 @@ static const uint32 FilterOther = ~(Location::City |
static BOOL APIENTRY LocationsProc(HWND hDlg,
UINT message,
UINT wParam,
LONG lParam)
WPARAM wParam,
LPARAM lParam)
{
LocationsDialog* dlg = reinterpret_cast<LocationsDialog*>(GetWindowLong(hDlg, DWL_USER));
LocationsDialog* dlg = reinterpret_cast<LocationsDialog*>(GetWindowLongPtr(hDlg, DWLP_USER));
switch (message)
{
@ -43,7 +43,7 @@ static BOOL APIENTRY LocationsProc(HWND hDlg,
dlg = reinterpret_cast<LocationsDialog*>(lParam);
if (dlg == NULL)
return EndDialog(hDlg, 0);
SetWindowLong(hDlg, DWL_USER, lParam);
SetWindowLongPtr(hDlg, DWLP_USER, lParam);
// Store original settings in case user cancels the dialog
// dlg->initialLocationFlags = dlg->appCore->getSimulation()->getActiveObserver();
@ -167,8 +167,8 @@ LocationsDialog::LocationsDialog(HINSTANCE appInstance,
hwnd = CreateDialogParam(appInstance,
MAKEINTRESOURCE(IDD_LOCATIONS),
parent,
LocationsProc,
reinterpret_cast<LONG>(this));
(DLGPROC)LocationsProc,
reinterpret_cast<LPARAM>(this));
}

76
src/celestia/win32/winmain.cpp
View File

@ -526,8 +526,8 @@ bool LoadItemTextFromFile(HWND hWnd,
BOOL APIENTRY AboutProc(HWND hDlg,
UINT message,
UINT wParam,
LONG lParam)
WPARAM wParam,
LPARAM lParam)
{
switch (message)
{
@ -577,8 +577,8 @@ BOOL APIENTRY AboutProc(HWND hDlg,
BOOL APIENTRY ControlsHelpProc(HWND hDlg,
UINT message,
UINT wParam,
LONG lParam)
WPARAM wParam,
LPARAM lParam)
{
switch (message)
{
@ -601,8 +601,8 @@ BOOL APIENTRY ControlsHelpProc(HWND hDlg,
BOOL APIENTRY LicenseProc(HWND hDlg,
UINT message,
UINT wParam,
LONG lParam)
WPARAM wParam,
LPARAM lParam)
{
switch (message)
{
@ -625,8 +625,8 @@ BOOL APIENTRY LicenseProc(HWND hDlg,
BOOL APIENTRY GLInfoProc(HWND hDlg,
UINT message,
UINT wParam,
LONG lParam)
WPARAM wParam,
LPARAM lParam)
{
switch (message)
{
@ -793,8 +793,8 @@ UINT CALLBACK ChooseMovieParamsProc(HWND hDlg, UINT message,
BOOL APIENTRY FindObjectProc(HWND hDlg,
UINT message,
UINT wParam,
LONG lParam)
WPARAM wParam,
LPARAM lParam)
{
switch (message)
{
@ -832,8 +832,8 @@ BOOL APIENTRY FindObjectProc(HWND hDlg,
BOOL APIENTRY AddBookmarkFolderProc(HWND hDlg,
UINT message,
UINT wParam,
LONG lParam)
WPARAM wParam,
LPARAM lParam)
{
switch (message)
{
@ -923,8 +923,8 @@ BOOL APIENTRY AddBookmarkFolderProc(HWND hDlg,
BOOL APIENTRY AddBookmarkProc(HWND hDlg,
UINT message,
UINT wParam,
LONG lParam)
WPARAM wParam,
LPARAM lParam)
{
switch (message)
{
@ -1091,7 +1091,7 @@ BOOL APIENTRY AddBookmarkProc(HWND hDlg,
if(hBookmarkTree = GetDlgItem(hDlg, IDC_BOOKMARK_FOLDERTREE))
{
DialogBox(hRes, MAKEINTRESOURCE(IDD_ADDBOOKMARK_FOLDER),
hDlg, AddBookmarkFolderProc);
hDlg, (DLGPROC)AddBookmarkFolderProc);
}
}
break;
@ -1103,8 +1103,8 @@ BOOL APIENTRY AddBookmarkProc(HWND hDlg,
BOOL APIENTRY RenameBookmarkProc(HWND hDlg,
UINT message,
UINT wParam,
LONG lParam)
WPARAM wParam,
LPARAM lParam)
{
switch (message)
{
@ -1187,8 +1187,8 @@ BOOL APIENTRY RenameBookmarkProc(HWND hDlg,
BOOL APIENTRY OrganizeBookmarksProc(HWND hDlg,
UINT message,
UINT wParam,
LONG lParam)
WPARAM wParam,
LPARAM lParam)
{
static UINT_PTR dragDropTimer;
switch (message)
@ -1244,7 +1244,7 @@ BOOL APIENTRY OrganizeBookmarksProc(HWND hDlg,
{
if (hBookmarkTree = GetDlgItem(hDlg, IDC_ORGANIZE_BOOKMARK_TREE))
{
DialogBox(hRes, MAKEINTRESOURCE(IDD_ADDBOOKMARK_FOLDER), hDlg, AddBookmarkFolderProc);
DialogBox(hRes, MAKEINTRESOURCE(IDD_ADDBOOKMARK_FOLDER), hDlg, (DLGPROC)AddBookmarkFolderProc);
}
}
else if (LOWORD(wParam) == IDC_ORGANIZE_BOOKMARKS_RENAME)
@ -1263,7 +1263,7 @@ BOOL APIENTRY OrganizeBookmarksProc(HWND hDlg,
{
DialogBox(hRes,
MAKEINTRESOURCE(IDD_RENAME_BOOKMARK),
hDlg, RenameBookmarkProc);
hDlg, (DLGPROC)RenameBookmarkProc);
}
}
}
@ -1385,8 +1385,8 @@ BOOL APIENTRY OrganizeBookmarksProc(HWND hDlg,
int selectedScreenMode = 0;
BOOL APIENTRY SelectDisplayModeProc(HWND hDlg,
UINT message,
UINT wParam,
LONG lParam)
WPARAM wParam,
LPARAM lParam)
{
switch (message)
{
@ -1573,7 +1573,7 @@ static HMENU CreatePlanetarySystemMenu(string parentName, const PlanetarySystem*
for(it=obj->begin(); it != obj->end(); it++)
AppendMenu(hSubMenu, MF_STRING, MENU_CHOOSE_PLANET + it->first, it->second.c_str());
AppendMenu(menu, MF_POPUP | MF_STRING, (DWORD)hSubMenu, menuName->c_str());
AppendMenu(menu, MF_POPUP | MF_STRING, (UINT_PTR)hSubMenu, menuName->c_str());
}
else
{
@ -1625,7 +1625,7 @@ VOID APIENTRY handlePopupMenu(HWND hwnd,
AppendMenu(hMenu, MF_STRING, ID_NAVIGATION_SYNCORBIT, UTF8ToCurrentCP(_("S&ync Orbit")).c_str());
AppendMenu(hMenu, MF_STRING, ID_INFO, UTF8ToCurrentCP(_("&Info")).c_str());
HMENU refVectorMenu = CreatePopupMenu();
AppendMenu(hMenu, MF_POPUP | MF_STRING, (DWORD) refVectorMenu, UTF8ToCurrentCP(_("&Reference Marks")).c_str());
AppendMenu(hMenu, MF_POPUP | MF_STRING, (UINT_PTR) refVectorMenu, UTF8ToCurrentCP(_("&Reference Marks")).c_str());
AppendMenu(refVectorMenu, MF_STRING, ID_RENDER_BODY_AXES, UTF8ToCurrentCP(_("Show Body Axes")).c_str());
AppendMenu(refVectorMenu, MF_STRING, ID_RENDER_FRAME_AXES, UTF8ToCurrentCP(_("Show Frame Axes")).c_str());
AppendMenu(refVectorMenu, MF_STRING, ID_RENDER_SUN_DIRECTION, UTF8ToCurrentCP(_("Show Sun Direction")).c_str());
@ -1644,7 +1644,7 @@ VOID APIENTRY handlePopupMenu(HWND hwnd,
if (satellites != NULL && satellites->getSystemSize() != 0)
{
HMENU satMenu = CreatePlanetarySystemMenu(name, satellites);
AppendMenu(hMenu, MF_POPUP | MF_STRING, (DWORD) satMenu,
AppendMenu(hMenu, MF_POPUP | MF_STRING, (UINT_PTR) satMenu,
UTF8ToCurrentCP(_("&Satellites")).c_str());
}
@ -1654,7 +1654,7 @@ VOID APIENTRY handlePopupMenu(HWND hwnd,
if (altSurfaces->size() != NULL)
{
HMENU surfMenu = CreateAlternateSurfaceMenu(*altSurfaces);
AppendMenu(hMenu, MF_POPUP | MF_STRING, (DWORD) surfMenu,
AppendMenu(hMenu, MF_POPUP | MF_STRING, (UINT_PTR) surfMenu,
UTF8ToCurrentCP(_("&Alternate Surfaces")).c_str());
}
delete altSurfaces;
@ -1678,9 +1678,9 @@ VOID APIENTRY handlePopupMenu(HWND hwnd,
SolarSystem* solarSys = iter->second;
HMENU planetsMenu = CreatePlanetarySystemMenu(name, solarSys->getPlanets());
if (name == "Sol")
AppendMenu(hMenu, MF_POPUP | MF_STRING, (DWORD) planetsMenu, UTF8ToCurrentCP(_("Orbiting Bodies")).c_str());
AppendMenu(hMenu, MF_POPUP | MF_STRING, (UINT_PTR) planetsMenu, UTF8ToCurrentCP(_("Orbiting Bodies")).c_str());
else
AppendMenu(hMenu, MF_POPUP | MF_STRING, (DWORD) planetsMenu, UTF8ToCurrentCP(_("Planets")).c_str());
AppendMenu(hMenu, MF_POPUP | MF_STRING, (UINT_PTR) planetsMenu, UTF8ToCurrentCP(_("Planets")).c_str());
}
}
break;
@ -2777,7 +2777,7 @@ static void HandleCaptureMovie(HWND hWnd)
Ofn.hInstance = appInstance;
Ofn.lpTemplateName = MAKEINTRESOURCE(IDD_MOVIE_PARAMS_CHOOSER);
Ofn.lpfnHook = ChooseMovieParamsProc;
Ofn.lpfnHook = (LPOFNHOOKPROC)ChooseMovieParamsProc;
// Display the Save dialog box.
if (GetSaveFileName(&Ofn))
@ -4047,7 +4047,7 @@ LRESULT CALLBACK MainWindowProc(HWND hWnd,
appCore->charEntered('H');
break;
case ID_NAVIGATION_SELECT:
DialogBox(hRes, MAKEINTRESOURCE(IDD_FINDOBJECT), hWnd, FindObjectProc);
DialogBox(hRes, MAKEINTRESOURCE(IDD_FINDOBJECT), hWnd, (DLGPROC)FindObjectProc);
break;
case ID_NAVIGATION_GOTO_OBJECT:
if (gotoObjectDlg == NULL)
@ -4123,7 +4123,7 @@ LRESULT CALLBACK MainWindowProc(HWND hWnd,
CreateDialogParam(hRes,
MAKEINTRESOURCE(IDD_DISPLAYMODE),
hWnd,
SelectDisplayModeProc,
(DLGPROC)SelectDisplayModeProc,
NULL);
break;
@ -4308,11 +4308,11 @@ LRESULT CALLBACK MainWindowProc(HWND hWnd,
break;
case ID_BOOKMARKS_ADDBOOKMARK:
DialogBox(hRes, MAKEINTRESOURCE(IDD_ADDBOOKMARK), hWnd, AddBookmarkProc);
DialogBox(hRes, MAKEINTRESOURCE(IDD_ADDBOOKMARK), hWnd, (DLGPROC)AddBookmarkProc);
break;
case ID_BOOKMARKS_ORGANIZE:
DialogBox(hRes, MAKEINTRESOURCE(IDD_ORGANIZE_BOOKMARKS), hWnd, OrganizeBookmarksProc);
DialogBox(hRes, MAKEINTRESOURCE(IDD_ORGANIZE_BOOKMARKS), hWnd, (DLGPROC)OrganizeBookmarksProc);
break;
case ID_HELP_RUNDEMO:
@ -4327,20 +4327,20 @@ LRESULT CALLBACK MainWindowProc(HWND hWnd,
CreateDialogParam(hRes,
MAKEINTRESOURCE(IDD_CONTROLSHELP),
hWnd,
ControlsHelpProc,
(DLGPROC)ControlsHelpProc,
NULL);
break;
case ID_HELP_ABOUT:
DialogBox(hRes, MAKEINTRESOURCE(IDD_ABOUT), hWnd, AboutProc);
DialogBox(hRes, MAKEINTRESOURCE(IDD_ABOUT), hWnd, (DLGPROC)AboutProc);
break;
case ID_HELP_GLINFO:
DialogBox(hRes, MAKEINTRESOURCE(IDD_GLINFO), hWnd, GLInfoProc);
DialogBox(hRes, MAKEINTRESOURCE(IDD_GLINFO), hWnd, (DLGPROC)GLInfoProc);
break;
case ID_HELP_LICENSE:
DialogBox(hRes, MAKEINTRESOURCE(IDD_LICENSE), hWnd, LicenseProc);
DialogBox(hRes, MAKEINTRESOURCE(IDD_LICENSE), hWnd, (DLGPROC)LicenseProc);
break;
case ID_INFO:

14
src/celestia/win32/winssbrowser.cpp
View File

@ -93,10 +93,10 @@ void AddPlanetarySystemToTree(const PlanetarySystem* sys, HWND treeView, int lev
BOOL APIENTRY SolarSystemBrowserProc(HWND hDlg,
UINT message,
UINT wParam,
LONG lParam)
WPARAM wParam,
LPARAM lParam)
{
SolarSystemBrowser* browser = reinterpret_cast<SolarSystemBrowser*>(GetWindowLong(hDlg, DWL_USER));
SolarSystemBrowser* browser = reinterpret_cast<SolarSystemBrowser*>(GetWindowLongPtr(hDlg, DWLP_USER));
switch (message)
{
@ -105,7 +105,7 @@ BOOL APIENTRY SolarSystemBrowserProc(HWND hDlg,
SolarSystemBrowser* browser = reinterpret_cast<SolarSystemBrowser*>(lParam);
if (browser == NULL)
return EndDialog(hDlg, 0);
SetWindowLong(hDlg, DWL_USER, lParam);
SetWindowLongPtr(hDlg, DWLP_USER, lParam);
HWND hwnd = GetDlgItem(hDlg, IDC_SSBROWSER_TREE);
const SolarSystem* solarSys = browser->appCore->getSimulation()->getNearestSolarSystem();
@ -190,12 +190,12 @@ SolarSystemBrowser::SolarSystemBrowser(HINSTANCE appInstance,
hwnd = CreateDialogParam(appInstance,
MAKEINTRESOURCE(IDD_SSBROWSER),
parent,
SolarSystemBrowserProc,
reinterpret_cast<LONG>(this));
(DLGPROC)SolarSystemBrowserProc,
reinterpret_cast<LONG_PTR>(this));
}
SolarSystemBrowser::~SolarSystemBrowser()
{
SetWindowLong(hwnd, DWL_USER, 0);
SetWindowLongPtr(hwnd, DWLP_USER, 0);
}

16
src/celestia/win32/winstarbrowser.cpp
View File

@ -256,7 +256,7 @@ bool InitStarBrowserItems(HWND listView, StarBrowser* browser)
solarSysPred.pos = browser->pos;
solarSysPred.solarSystems = solarSystems;
stars = FindStars(*stardb, solarSysPred,
min((unsigned int) browser->nStars, solarSystems->size()));
min((unsigned int) browser->nStars, (unsigned int) solarSystems->size()));
}
break;
@ -403,10 +403,10 @@ void RefreshItems(HWND hDlg, StarBrowser* browser)
BOOL APIENTRY StarBrowserProc(HWND hDlg,
UINT message,
UINT wParam,
LONG lParam)
WPARAM wParam,
LPARAM lParam)
{
StarBrowser* browser = reinterpret_cast<StarBrowser*>(GetWindowLong(hDlg, DWL_USER));
StarBrowser* browser = reinterpret_cast<StarBrowser*>(GetWindowLongPtr(hDlg, DWLP_USER));
switch (message)
{
@ -415,7 +415,7 @@ BOOL APIENTRY StarBrowserProc(HWND hDlg,
StarBrowser* browser = reinterpret_cast<StarBrowser*>(lParam);
if (browser == NULL)
return EndDialog(hDlg, 0);
SetWindowLong(hDlg, DWL_USER, lParam);
SetWindowLongPtr(hDlg, DWLP_USER, lParam);
HWND hwnd = GetDlgItem(hDlg, IDC_STARBROWSER_LIST);
InitStarBrowserColumns(hwnd);
@ -618,12 +618,12 @@ StarBrowser::StarBrowser(HINSTANCE appInstance,
hwnd = CreateDialogParam(appInstance,
MAKEINTRESOURCE(IDD_STARBROWSER),
parent,
StarBrowserProc,
reinterpret_cast<LONG>(this));
(DLGPROC)StarBrowserProc,
reinterpret_cast<LONG_PTR>(this));
}
StarBrowser::~StarBrowser()
{
SetWindowLong(hwnd, DWL_USER, 0);
SetWindowLongPtr(hwnd, DWLP_USER, 0);
}

10
src/celestia/win32/wintime.cpp
View File

@ -84,7 +84,7 @@ SetTimeDialog::init(HWND _hDlg)
{
hDlg = _hDlg;
SetWindowLong(hDlg, DWL_USER, reinterpret_cast<LPARAM>(this));
SetWindowLongPtr(hDlg, DWLP_USER, reinterpret_cast<LPARAM>(this));
getLocalTimeZoneInfo();
tdb = appCore->getSimulation()->getTime();
@ -292,10 +292,10 @@ SetTimeDialog::notify(int id, const NMHDR& hdr)
static BOOL APIENTRY
SetTimeProc(HWND hDlg,
UINT message,
UINT wParam,
LONG lParam)
WPARAM wParam,
LPARAM lParam)
{
SetTimeDialog* timeDialog = reinterpret_cast<SetTimeDialog*>(GetWindowLong(hDlg, DWL_USER));
SetTimeDialog* timeDialog = reinterpret_cast<SetTimeDialog*>(GetWindowLongPtr(hDlg, DWLP_USER));
switch (message)
{
@ -327,7 +327,7 @@ ShowSetTimeDialog(HINSTANCE appInstance,
{
SetTimeDialog* timeDialog = new SetTimeDialog(appCore);
DialogBoxParam(appInstance, MAKEINTRESOURCE(IDD_SETTIME), appWindow, SetTimeProc, reinterpret_cast<LPARAM>(timeDialog));
DialogBoxParam(appInstance, MAKEINTRESOURCE(IDD_SETTIME), appWindow, (DLGPROC)SetTimeProc, reinterpret_cast<LPARAM>(timeDialog));
delete timeDialog;
}

12
src/celestia/win32/wintourguide.cpp
View File

@ -27,10 +27,10 @@ using namespace std;
BOOL APIENTRY TourGuideProc(HWND hDlg,
UINT message,
UINT wParam,
LONG lParam)
WPARAM wParam,
LPARAM lParam)
{
TourGuide* tourGuide = reinterpret_cast<TourGuide*>(GetWindowLong(hDlg, DWL_USER));
TourGuide* tourGuide = reinterpret_cast<TourGuide*>(GetWindowLongPtr(hDlg, DWLP_USER));
switch (message)
{
@ -39,7 +39,7 @@ BOOL APIENTRY TourGuideProc(HWND hDlg,
TourGuide* guide = reinterpret_cast<TourGuide*>(lParam);
if (guide == NULL)
return EndDialog(hDlg, 0);
SetWindowLong(hDlg, DWL_USER, lParam);
SetWindowLongPtr(hDlg, DWLP_USER, lParam);
// guide->selectedDest = NULL;
@ -151,6 +151,6 @@ TourGuide::TourGuide(HINSTANCE appInstance,
hwnd = CreateDialogParam(appInstance,
MAKEINTRESOURCE(IDD_TOURGUIDE),
parent,
TourGuideProc,
reinterpret_cast<LONG>(this));
(DLGPROC)TourGuideProc,
reinterpret_cast<LONG_PTR>(this));
}

12
src/celestia/win32/winviewoptsdlg.cpp
View File

@ -24,10 +24,10 @@ static const float MaxDistanceLimit = 1.0e6f;
static BOOL APIENTRY ViewOptionsProc(HWND hDlg,
UINT message,
UINT wParam,
LONG lParam)
WPARAM wParam,
LPARAM lParam)
{
ViewOptionsDialog* Dlg = reinterpret_cast<ViewOptionsDialog*>(GetWindowLong(hDlg, DWL_USER));
ViewOptionsDialog* Dlg = reinterpret_cast<ViewOptionsDialog*>(GetWindowLongPtr(hDlg, DWLP_USER));
switch (message)
{
@ -36,7 +36,7 @@ static BOOL APIENTRY ViewOptionsProc(HWND hDlg,
ViewOptionsDialog* Dlg = reinterpret_cast<ViewOptionsDialog*>(lParam);
if (Dlg == NULL)
return EndDialog(hDlg, 0);
SetWindowLong(hDlg, DWL_USER, lParam);
SetWindowLongPtr(hDlg, DWLP_USER, lParam);
//Read labelMode, renderFlags and hud detail
Dlg->initialRenderFlags = Dlg->appCore->getRenderer()->getRenderFlags();
@ -280,8 +280,8 @@ ViewOptionsDialog::ViewOptionsDialog(HINSTANCE appInstance,
hwnd = CreateDialogParam(appInstance,
MAKEINTRESOURCE(IDD_VIEWOPTIONS),
parent,
ViewOptionsProc,
reinterpret_cast<LONG>(this));
(DLGPROC)ViewOptionsProc,
reinterpret_cast<LONG_PTR>(this));
}

BIN
windows/dll/x86/lua5.1.dll
View File

Binary file not shown.

6
windows/inc/libintl/libintl.h
View File

@ -13,17 +13,21 @@
You should have received a copy of the GNU Library General Public
License along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. */
#ifndef _LIBINTL_H
#define _LIBINTL_H 1
#ifdef LIBINTL_STATIC
#define LIBINTL_DLL_EXPORTED
#else /* LIBINTL_STATIC */
#ifdef BUILDING_LIBINTL
#define LIBINTL_DLL_EXPORTED __declspec(dllexport)
#else
#define LIBINTL_DLL_EXPORTED __declspec(dllimport)
#endif
#endif /* LIBINTL_STATIC */
#include <locale.h>

6790
windows/inc/libpng/png.h
View File

File diff suppressed because it is too large Load Diff

2157
windows/inc/libpng/pngconf.h
View File

File diff suppressed because it is too large Load Diff

217
windows/inc/libpng/pnglibconf.h 100644
View File

@ -0,0 +1,217 @@
/* libpng 1.6.29 STANDARD API DEFINITION */
/* pnglibconf.h - library build configuration */
/* Libpng version 1.6.29 - March 16, 2017 */
/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */
/* This code is released under the libpng license. */
/* For conditions of distribution and use, see the disclaimer */
/* and license in png.h */
/* pnglibconf.h */
/* Machine generated file: DO NOT EDIT */
/* Derived from: scripts/pnglibconf.dfa */
#ifndef PNGLCONF_H
#define PNGLCONF_H
/* options */
#define PNG_16BIT_SUPPORTED
#define PNG_ALIGNED_MEMORY_SUPPORTED
/*#undef PNG_ARM_NEON_API_SUPPORTED*/
/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/
/*#undef PNG_POWERPC_VSX_API_SUPPORTED*/
/*#undef PNG_POWERPC_VSX_CHECK_SUPPORTED*/
#define PNG_BENIGN_ERRORS_SUPPORTED
#define PNG_BENIGN_READ_ERRORS_SUPPORTED
/*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/
#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
#define PNG_COLORSPACE_SUPPORTED
#define PNG_CONSOLE_IO_SUPPORTED
#define PNG_CONVERT_tIME_SUPPORTED
#define PNG_EASY_ACCESS_SUPPORTED
/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
#define PNG_ERROR_TEXT_SUPPORTED
#define PNG_FIXED_POINT_SUPPORTED
#define PNG_FLOATING_ARITHMETIC_SUPPORTED
#define PNG_FLOATING_POINT_SUPPORTED
#define PNG_FORMAT_AFIRST_SUPPORTED
#define PNG_FORMAT_BGR_SUPPORTED
#define PNG_GAMMA_SUPPORTED
#define PNG_GET_PALETTE_MAX_SUPPORTED
#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
#define PNG_INCH_CONVERSIONS_SUPPORTED
#define PNG_INFO_IMAGE_SUPPORTED
#define PNG_IO_STATE_SUPPORTED
#define PNG_MNG_FEATURES_SUPPORTED
#define PNG_POINTER_INDEXING_SUPPORTED
#define PNG_PROGRESSIVE_READ_SUPPORTED
#define PNG_READ_16BIT_SUPPORTED
#define PNG_READ_ALPHA_MODE_SUPPORTED
#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
#define PNG_READ_BACKGROUND_SUPPORTED
#define PNG_READ_BGR_SUPPORTED
#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
#define PNG_READ_COMPRESSED_TEXT_SUPPORTED
#define PNG_READ_EXPAND_16_SUPPORTED
#define PNG_READ_EXPAND_SUPPORTED
#define PNG_READ_FILLER_SUPPORTED
#define PNG_READ_GAMMA_SUPPORTED
#define PNG_READ_GET_PALETTE_MAX_SUPPORTED
#define PNG_READ_GRAY_TO_RGB_SUPPORTED
#define PNG_READ_INTERLACING_SUPPORTED
#define PNG_READ_INT_FUNCTIONS_SUPPORTED
#define PNG_READ_INVERT_ALPHA_SUPPORTED
#define PNG_READ_INVERT_SUPPORTED
#define PNG_READ_OPT_PLTE_SUPPORTED
#define PNG_READ_PACKSWAP_SUPPORTED
#define PNG_READ_PACK_SUPPORTED
#define PNG_READ_QUANTIZE_SUPPORTED
#define PNG_READ_RGB_TO_GRAY_SUPPORTED
#define PNG_READ_SCALE_16_TO_8_SUPPORTED
#define PNG_READ_SHIFT_SUPPORTED
#define PNG_READ_STRIP_16_TO_8_SUPPORTED
#define PNG_READ_STRIP_ALPHA_SUPPORTED
#define PNG_READ_SUPPORTED
#define PNG_READ_SWAP_ALPHA_SUPPORTED
#define PNG_READ_SWAP_SUPPORTED
#define PNG_READ_TEXT_SUPPORTED
#define PNG_READ_TRANSFORMS_SUPPORTED
#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
#define PNG_READ_USER_CHUNKS_SUPPORTED
#define PNG_READ_USER_TRANSFORM_SUPPORTED
#define PNG_READ_bKGD_SUPPORTED
#define PNG_READ_cHRM_SUPPORTED
#define PNG_READ_gAMA_SUPPORTED
#define PNG_READ_hIST_SUPPORTED
#define PNG_READ_iCCP_SUPPORTED
#define PNG_READ_iTXt_SUPPORTED
#define PNG_READ_oFFs_SUPPORTED
#define PNG_READ_pCAL_SUPPORTED
#define PNG_READ_pHYs_SUPPORTED
#define PNG_READ_sBIT_SUPPORTED
#define PNG_READ_sCAL_SUPPORTED
#define PNG_READ_sPLT_SUPPORTED
#define PNG_READ_sRGB_SUPPORTED
#define PNG_READ_tEXt_SUPPORTED
#define PNG_READ_tIME_SUPPORTED
#define PNG_READ_tRNS_SUPPORTED
#define PNG_READ_zTXt_SUPPORTED
#define PNG_SAVE_INT_32_SUPPORTED
#define PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
#define PNG_SEQUENTIAL_READ_SUPPORTED
#define PNG_SETJMP_SUPPORTED
#define PNG_SET_OPTION_SUPPORTED
#define PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
#define PNG_SET_USER_LIMITS_SUPPORTED
#define PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
#define PNG_SIMPLIFIED_READ_BGR_SUPPORTED
#define PNG_SIMPLIFIED_READ_SUPPORTED
#define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
#define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
#define PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
#define PNG_SIMPLIFIED_WRITE_SUPPORTED
#define PNG_STDIO_SUPPORTED
#define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
#define PNG_TEXT_SUPPORTED
#define PNG_TIME_RFC1123_SUPPORTED
#define PNG_UNKNOWN_CHUNKS_SUPPORTED
#define PNG_USER_CHUNKS_SUPPORTED
#define PNG_USER_LIMITS_SUPPORTED
#define PNG_USER_MEM_SUPPORTED
#define PNG_USER_TRANSFORM_INFO_SUPPORTED
#define PNG_USER_TRANSFORM_PTR_SUPPORTED
#define PNG_WARNINGS_SUPPORTED
#define PNG_WRITE_16BIT_SUPPORTED
#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
#define PNG_WRITE_BGR_SUPPORTED
#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
#define PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
#define PNG_WRITE_FILLER_SUPPORTED
#define PNG_WRITE_FILTER_SUPPORTED
#define PNG_WRITE_FLUSH_SUPPORTED
#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED
#define PNG_WRITE_INTERLACING_SUPPORTED
#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
#define PNG_WRITE_INVERT_SUPPORTED
#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
#define PNG_WRITE_PACKSWAP_SUPPORTED
#define PNG_WRITE_PACK_SUPPORTED
#define PNG_WRITE_SHIFT_SUPPORTED
#define PNG_WRITE_SUPPORTED
#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
#define PNG_WRITE_SWAP_SUPPORTED
#define PNG_WRITE_TEXT_SUPPORTED
#define PNG_WRITE_TRANSFORMS_SUPPORTED
#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
#define PNG_WRITE_bKGD_SUPPORTED
#define PNG_WRITE_cHRM_SUPPORTED
#define PNG_WRITE_gAMA_SUPPORTED
#define PNG_WRITE_hIST_SUPPORTED
#define PNG_WRITE_iCCP_SUPPORTED
#define PNG_WRITE_iTXt_SUPPORTED
#define PNG_WRITE_oFFs_SUPPORTED
#define PNG_WRITE_pCAL_SUPPORTED
#define PNG_WRITE_pHYs_SUPPORTED
#define PNG_WRITE_sBIT_SUPPORTED
#define PNG_WRITE_sCAL_SUPPORTED
#define PNG_WRITE_sPLT_SUPPORTED
#define PNG_WRITE_sRGB_SUPPORTED
#define PNG_WRITE_tEXt_SUPPORTED
#define PNG_WRITE_tIME_SUPPORTED
#define PNG_WRITE_tRNS_SUPPORTED
#define PNG_WRITE_zTXt_SUPPORTED
#define PNG_bKGD_SUPPORTED
#define PNG_cHRM_SUPPORTED
#define PNG_gAMA_SUPPORTED
#define PNG_hIST_SUPPORTED
#define PNG_iCCP_SUPPORTED
#define PNG_iTXt_SUPPORTED
#define PNG_oFFs_SUPPORTED
#define PNG_pCAL_SUPPORTED
#define PNG_pHYs_SUPPORTED
#define PNG_sBIT_SUPPORTED
#define PNG_sCAL_SUPPORTED
#define PNG_sPLT_SUPPORTED
#define PNG_sRGB_SUPPORTED
#define PNG_tEXt_SUPPORTED
#define PNG_tIME_SUPPORTED
#define PNG_tRNS_SUPPORTED
#define PNG_zTXt_SUPPORTED
/* end of options */
/* settings */
#define PNG_API_RULE 0
#define PNG_DEFAULT_READ_MACROS 1
#define PNG_GAMMA_THRESHOLD_FIXED 5000
#define PNG_IDAT_READ_SIZE PNG_ZBUF_SIZE
#define PNG_INFLATE_BUF_SIZE 1024
#define PNG_LINKAGE_API extern
#define PNG_LINKAGE_CALLBACK extern
#define PNG_LINKAGE_DATA extern
#define PNG_LINKAGE_FUNCTION extern
#define PNG_MAX_GAMMA_8 11
#define PNG_QUANTIZE_BLUE_BITS 5
#define PNG_QUANTIZE_GREEN_BITS 5
#define PNG_QUANTIZE_RED_BITS 5
#define PNG_TEXT_Z_DEFAULT_COMPRESSION (-1)
#define PNG_TEXT_Z_DEFAULT_STRATEGY 0
#define PNG_USER_CHUNK_CACHE_MAX 1000
#define PNG_USER_CHUNK_MALLOC_MAX 8000000
#define PNG_USER_HEIGHT_MAX 1000000
#define PNG_USER_WIDTH_MAX 1000000
#define PNG_ZBUF_SIZE 8192
#define PNG_ZLIB_VERNUM 0 /* unknown */
#define PNG_Z_DEFAULT_COMPRESSION (-1)
#define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
#define PNG_Z_DEFAULT_STRATEGY 1
#define PNG_sCAL_PRECISION 5
#define PNG_sRGB_PROFILE_CHECKS 2
/* end of settings */
#endif /* PNGLCONF_H */

0
windows/inc/lua-5.1/lauxlib.h → windows/inc/lua/lauxlib.h
View File

0
windows/inc/lua-5.1/lua.h → windows/inc/lua/lua.h
View File

0
windows/inc/lua-5.1/lua.hpp → windows/inc/lua/lua.hpp
View File

0
windows/inc/lua-5.1/luaconf.h → windows/inc/lua/luaconf.h
View File

0
windows/inc/lua-5.1/lualib.h → windows/inc/lua/lualib.h
View File

141
windows/inc/spice/SpiceErr.h 100644
View File

@ -0,0 +1,141 @@
/*
-Header_File SpiceErr.h ( CSPICE error handling definitions )
-Abstract
Perform CSPICE definitions for error handling APIs.
-Disclaimer
THIS SOFTWARE AND ANY RELATED MATERIALS WERE CREATED BY THE
CALIFORNIA INSTITUTE OF TECHNOLOGY (CALTECH) UNDER A U.S.
GOVERNMENT CONTRACT WITH THE NATIONAL AERONAUTICS AND SPACE
ADMINISTRATION (NASA). THE SOFTWARE IS TECHNOLOGY AND SOFTWARE
PUBLICLY AVAILABLE UNDER U.S. EXPORT LAWS AND IS PROVIDED "AS-IS"
TO THE RECIPIENT WITHOUT WARRANTY OF ANY KIND, INCLUDING ANY
WARRANTIES OF PERFORMANCE OR MERCHANTABILITY OR FITNESS FOR A
PARTICULAR USE OR PURPOSE (AS SET FORTH IN UNITED STATES UCC
SECTIONS 2312-2313) OR FOR ANY PURPOSE WHATSOEVER, FOR THE
SOFTWARE AND RELATED MATERIALS, HOWEVER USED.
IN NO EVENT SHALL CALTECH, ITS JET PROPULSION LABORATORY, OR NASA
BE LIABLE FOR ANY DAMAGES AND/OR COSTS, INCLUDING, BUT NOT
LIMITED TO, INCIDENTAL OR CONSEQUENTIAL DAMAGES OF ANY KIND,
INCLUDING ECONOMIC DAMAGE OR INJURY TO PROPERTY AND LOST PROFITS,
REGARDLESS OF WHETHER CALTECH, JPL, OR NASA BE ADVISED, HAVE
REASON TO KNOW, OR, IN FACT, SHALL KNOW OF THE POSSIBILITY.
RECIPIENT BEARS ALL RISK RELATING TO QUALITY AND PERFORMANCE OF
THE SOFTWARE AND ANY RELATED MATERIALS, AND AGREES TO INDEMNIFY
CALTECH AND NASA FOR ALL THIRD-PARTY CLAIMS RESULTING FROM THE
ACTIONS OF RECIPIENT IN THE USE OF THE SOFTWARE.
-Required_Reading
None.
-Particulars
This header defines constants that may be referenced in
application code that calls CSPICE error handling functions.
CONSTANTS
==========
Name Description
---- ----------
SPICE_ERROR_LMSGLN Maximum length of a long error message,
including the null terminator.
SPICE_ERROR_SMSGLN Maximum length of a short error message,
including the null terminator.
SPICE_ERROR_XMSGLN Maximum length of a short error
explanation message, including the null
terminator.
SPICE_ERROR_MODLEN Maximum length of a module name
appearing in the traceback message,
including the null terminator.
SPICE_ERROR_MAXMOD Maximum count of module names
appearing in the traceback message.
SPICE_ERROR_TRCLEN Maximum length of a traceback message,
including the null terminator.
-Literature_References
None.
-Author_and_Institution
N.J. Bachman (JPL)
-Restrictions
None.
-Version
-CSPICE Version 1.0.0, 05-NOV-2013 (NJB)
*/
#ifndef HAVE_SPICE_ERROR_HANDLING
#define HAVE_SPICE_ERROR_HANDLING
/*
Local constants
*/
#define ARROWLEN 5
/*
Public constants
*/
/*
Long error message length, which is equal to
( 23 * 80 ) + 1
*/
#define SPICE_ERROR_LMSGLN 1841
/*
Short error message length:
*/
#define SPICE_ERROR_SMSGLN 26
/*
Short error message explanation length:
*/
#define SPICE_ERROR_XMSGLN 81
/*
Module name length for traceback entries:
*/
#define SPICE_ERROR_MODLEN 33
/*
Maximum module count for traceback string:
*/
#define SPICE_ERROR_MAXMOD 100
/*
Maximum length of traceback string returned
by qcktrc_c.
*/
#define SPICE_ERROR_TRCLEN ( ( SPICE_ERROR_MAXMOD \
* ( SPICE_ERROR_MODLEN-1 ) ) \
+ ( ARROWLEN \
* ( SPICE_ERROR_MAXMOD-1 ) ) \
+ 1 )
#endif

193
windows/inc/spice/SpiceFrm.h 100644
View File

@ -0,0 +1,193 @@
/*
-Header_File SpiceFrm.h ( CSPICE frame subsystem definitions )
-Abstract
Perform CSPICE definitions for frame subsystem APIs.
-Disclaimer
THIS SOFTWARE AND ANY RELATED MATERIALS WERE CREATED BY THE
CALIFORNIA INSTITUTE OF TECHNOLOGY (CALTECH) UNDER A U.S.
GOVERNMENT CONTRACT WITH THE NATIONAL AERONAUTICS AND SPACE
ADMINISTRATION (NASA). THE SOFTWARE IS TECHNOLOGY AND SOFTWARE
PUBLICLY AVAILABLE UNDER U.S. EXPORT LAWS AND IS PROVIDED "AS-IS"
TO THE RECIPIENT WITHOUT WARRANTY OF ANY KIND, INCLUDING ANY
WARRANTIES OF PERFORMANCE OR MERCHANTABILITY OR FITNESS FOR A
PARTICULAR USE OR PURPOSE (AS SET FORTH IN UNITED STATES UCC
SECTIONS 2312-2313) OR FOR ANY PURPOSE WHATSOEVER, FOR THE
SOFTWARE AND RELATED MATERIALS, HOWEVER USED.
IN NO EVENT SHALL CALTECH, ITS JET PROPULSION LABORATORY, OR NASA
BE LIABLE FOR ANY DAMAGES AND/OR COSTS, INCLUDING, BUT NOT
LIMITED TO, INCIDENTAL OR CONSEQUENTIAL DAMAGES OF ANY KIND,
INCLUDING ECONOMIC DAMAGE OR INJURY TO PROPERTY AND LOST PROFITS,
REGARDLESS OF WHETHER CALTECH, JPL, OR NASA BE ADVISED, HAVE
REASON TO KNOW, OR, IN FACT, SHALL KNOW OF THE POSSIBILITY.
RECIPIENT BEARS ALL RISK RELATING TO QUALITY AND PERFORMANCE OF
THE SOFTWARE AND ANY RELATED MATERIALS, AND AGREES TO INDEMNIFY
CALTECH AND NASA FOR ALL THIRD-PARTY CLAIMS RESULTING FROM THE
ACTIONS OF RECIPIENT IN THE USE OF THE SOFTWARE.
-Required_Reading
CK
FRAMES
PCK
-Particulars
This header defines constants that may be referenced in
application code that calls CSPICE frame subsystem APIs.
CONSTANTS
==========
Frame counts
------------
The following parameter are counts of built-in frames. These
parameters correspond to those defined in the SPICELIB Fortran
INCLUDE files
ninert.inc
nninrt.inc
Name Description
---- ----------
SPICE_NFRAME_NINERT Number of built-in inertial frames.
SPICE_NFRAME_NNINRT Number of built-in non-inertial frames.
Frame classes
-------------
The following parameters identify SPICE frame classes. These
parameters correspond to those defined in the SPICELIB Fortran
INCLUDE file frmtyp.inc. See the Frames Required Reading for a
detailed discussion of frame classes.
Name Description
---- ----------
SPICE_FRMTYP_INERTL an inertial frame that is listed in the
f2c'd routine chgirf_ and that requires
no external file to compute the
transformation from or to any other
inertial frame.
SPICE_FRMTYP_PCK is a frame that is specified relative
to some built-in, inertial frame (of
class SPICE_FRMTYP_INERTL) and that has
an IAU model that may be retrieved from
the PCK system via a call to the
routine tisbod_c.
SPICE_FRMTYP_CK is a frame defined by a C-kernel.
SPICE_FRMTYP_TK is a "text kernel" frame. These frames
are offset from their associated
"relative" frames by a constant
rotation.
SPICE_FRMTYP_DYN is a "dynamic" frame. These currently
are limited to parameterized frames
where the full frame definition depends
on parameters supplied via a frame
kernel.
SPICE_FRMTYP_ALL indicates any of the above classes.
This parameter is used in APIs that
fetch information about frames of a
specified class.
-Literature_References
None.
-Author_and_Institution
N.J. Bachman (JPL)
-Restrictions
None.
-Version
-CSPICE Version 1.0.0, 23-MAY-2012 (NJB)
*/
#ifndef HAVE_SPICE_FRAME_DEFS
#define HAVE_SPICE_FRAME_DEFS
/*
Frame counts:
*/
/*
Number of built-in inertial frames. This number must be kept in
sync with that defined in the SPICELIB include file ninert.inc.
*/
#define SPICE_NFRAME_NINERT 21
/*
Number of built-in non-inertial frames. This number must be kept in
sync with that defined in the SPICELIB include file nninrt.inc.
*/
#define SPICE_NFRAME_NNINRT 105
/*
The frame class codes defined here are identical
to those used in SPICELIB.
*/
/*
Inertial, built-in frames:
*/
#define SPICE_FRMTYP_INERTL 1
/*
PCK frames:
*/
#define SPICE_FRMTYP_PCK 2
/*
CK frames:
*/
#define SPICE_FRMTYP_CK 3
/*
TK frames:
*/
#define SPICE_FRMTYP_TK 4
/*
Dynamic frames:
*/
#define SPICE_FRMTYP_DYN 5
/*
All frame classes:
*/
#define SPICE_FRMTYP_ALL ( -1 )
#endif

341
windows/inc/spice/SpiceGF.h 100644
View File

@ -0,0 +1,341 @@
/*
-Header_File SpiceGF.h ( CSPICE GF-specific definitions )
-Abstract
Perform CSPICE GF-specific definitions.
-Disclaimer
THIS SOFTWARE AND ANY RELATED MATERIALS WERE CREATED BY THE
CALIFORNIA INSTITUTE OF TECHNOLOGY (CALTECH) UNDER A U.S.
GOVERNMENT CONTRACT WITH THE NATIONAL AERONAUTICS AND SPACE
ADMINISTRATION (NASA). THE SOFTWARE IS TECHNOLOGY AND SOFTWARE
PUBLICLY AVAILABLE UNDER U.S. EXPORT LAWS AND IS PROVIDED "AS-IS"
TO THE RECIPIENT WITHOUT WARRANTY OF ANY KIND, INCLUDING ANY
WARRANTIES OF PERFORMANCE OR MERCHANTABILITY OR FITNESS FOR A
PARTICULAR USE OR PURPOSE (AS SET FORTH IN UNITED STATES UCC
SECTIONS 2312-2313) OR FOR ANY PURPOSE WHATSOEVER, FOR THE
SOFTWARE AND RELATED MATERIALS, HOWEVER USED.
IN NO EVENT SHALL CALTECH, ITS JET PROPULSION LABORATORY, OR NASA
BE LIABLE FOR ANY DAMAGES AND/OR COSTS, INCLUDING, BUT NOT
LIMITED TO, INCIDENTAL OR CONSEQUENTIAL DAMAGES OF ANY KIND,
INCLUDING ECONOMIC DAMAGE OR INJURY TO PROPERTY AND LOST PROFITS,
REGARDLESS OF WHETHER CALTECH, JPL, OR NASA BE ADVISED, HAVE
REASON TO KNOW, OR, IN FACT, SHALL KNOW OF THE POSSIBILITY.
RECIPIENT BEARS ALL RISK RELATING TO QUALITY AND PERFORMANCE OF
THE SOFTWARE AND ANY RELATED MATERIALS, AND AGREES TO INDEMNIFY
CALTECH AND NASA FOR ALL THIRD-PARTY CLAIMS RESULTING FROM THE
ACTIONS OF RECIPIENT IN THE USE OF THE SOFTWARE.
-Required_Reading
GF
-Keywords
GEOMETRY
SEARCH
-Exceptions
None
-Files
None
-Particulars
This header defines macros that may be referenced in application
code that calls CSPICE GF functions.
Macros
======
Workspace parameters
--------------------
CSPICE applications normally don't declare workspace arguments
and therefore don't directly reference workspace size parameters.
However, CSPICE GF APIs dealing with numeric constraints
dynamically allocate workspace memory; the amount allocated
depends on the number of intervals the workspace windows can
hold. This amount is an input argument to the GF numeric quantity
APIs.
The parameters below are used to calculate the amount of memory
required. Each workspace window contains 6 double precision
numbers in its control area and 2 double precision numbers for
each interval it can hold.
Name Description
---- ----------
SPICE_GF_NWMAX Maximum number of windows required for
a user-defined workspace array.
SPICE_GF_NWDIST Number of workspace windows used by
gfdist_c and the underlying SPICELIB
routine GFDIST.
SPICE_GF_NWILUM Number of workspace windows used by
gfilum_c and the underlying SPICELIB
routine GFILUM.
SPICE_GF_NWSEP Number of workspace windows used by
gfsep_c and the underlying SPICELIB
routine GFSEP.
SPICE_GF_NWRR Number of workspace windows used by
gfrr_c and the underlying SPICELIB
routine GFRR.
SPICE_GF_NWPA Number of workspace windows used by
gfpa_c and the underlying SPICELIB
routine GFPA.
Field of view (FOV) parameters
------------------------------
Name Description
---- ----------
SPICE_GF_MAXVRT Maximum allowed number of boundary
vectors for a polygonal FOV.
SPICE_GF_CIRFOV Parameter identifying a circular FOV.
SPICE_GF_ELLFOV Parameter identifying a elliptical FOV.
SPICE_GF_POLFOV Parameter identifying a polygonal FOV.
SPICE_GF_RECFOV Parameter identifying a rectangular FOV.
SPICE_GF_SHPLEN Parameter specifying maximum length of
a FOV shape name.
SPICE_GF_MARGIN is a small positive number used to
constrain the orientation of the
boundary vectors of polygonal FOVs. Such
FOVs must satisfy the following
constraints:
1) The boundary vectors must be
contained within a right circular
cone of angular radius less than
than (pi/2) - MARGIN radians; in
other words, there must be a vector
A such that all boundary vectors
have angular separation from A of
less than (pi/2)-MARGIN radians.
2) There must be a pair of boundary
vectors U, V such that all other
boundary vectors lie in the same
half space bounded by the plane
containing U and V. Furthermore, all
other boundary vectors must have
orthogonal projections onto a plane
normal to this plane such that the
projections have angular separation
of at least 2*MARGIN radians from
the plane spanned by U and V.
MARGIN is currently set to 1.D-12.
Occultation parameters
----------------------
SPICE_GF_ANNULR Parameter identifying an "annular
occultation." This geometric condition
is more commonly known as a "transit."
The limb of the background object must
not be blocked by the foreground object
in order for an occultation to be
"annular."
SPICE_GF_ANY Parameter identifying any type of
occultation or transit.
SPICE_GF_FULL Parameter identifying a full
occultation: the foreground body
entirely blocks the background body.
SPICE_GF_PARTL Parameter identifying an "partial
occultation." This is an occultation in
which the foreground body blocks part,
but not all, of the limb of the
background body.
Target shape parameters
-----------------------
SPICE_GF_EDSHAP Parameter indicating a target object's
shape is modeled as an ellipsoid.
SPICE_GF_PTSHAP Parameter indicating a target object's
shape is modeled as a point.
SPICE_GF_RYSHAP Parameter indicating a target object's
"shape" is modeled as a ray emanating
from an observer's location. This model
may be used in visibility computations
for targets whose direction, but not
position, relative to an observer is
known.
SPICE_GF_SPSHAP Parameter indicating a target object's
shape is modeled as a point.
Search parameters
-----------------
These parameters affect the manner in which GF searches are
performed.
SPICE_GF_ADDWIN is a parameter used in numeric quantity
searches that use an equality
constraint. This parameter is used to
expand the confinement window (the
window over which the search is
performed) by a small amount at both
ends. This expansion accommodates the
case where a geometric quantity is equal
to a reference value at a boundary point
of the original confinement window.
SPICE_GF_CNVTOL is the default convergence tolerance
used by GF routines that don't support a
user-supplied tolerance value. GF
searches for roots will terminate when a
root is bracketed by times separated by
no more than this tolerance. Units are
seconds.
Configuration parameter
-----------------------
SPICE_GFEVNT_MAXPAR Parameter indicating the maximum number of
elements needed for the 'qnames' and 'q*pars'
arrays used in gfevnt_c.
SpiceChar qcpars[SPICE_GFEVNT_MAXPAR][LNSIZE];
SpiceDouble qdpars[SPICE_GFEVNT_MAXPAR];
SpiceInt qipars[SPICE_GFEVNT_MAXPAR];
SpiceBoolean qlpars[SPICE_GFEVNT_MAXPAR];
-Examples
None
-Restrictions
None.
-Literature_References
None.
-Author_and_Institution
N.J. Bachman (JPL)
L.S. Elson (JPL)
-Version
-CSPICE Version 2.1.0, 23-FEB-2012 (NJB)
Added parameters:
SPICE_GF_NWILUM
SPICE_GF_NWRR
SPICE_GF_NWPA
-CSPICE Version 2.0.0, 23-JUN-2009 (NJB)
Added parameter for maximum length of FOV shape string.
-CSPICE Version 1.0.0, 11-MAR-2009 (NJB)
*/
#ifndef HAVE_SPICE_GF_H
#define HAVE_SPICE_GF_H
/*
See the Particulars section above for parameter descriptions.
*/
/*
Workspace parameters
*/
#define SPICE_GF_NWMAX 15
#define SPICE_GF_NWDIST 5
#define SPICE_GF_NWILUM 5
#define SPICE_GF_NWSEP 5
#define SPICE_GF_NWRR 5
#define SPICE_GF_NWPA 5
/*
Field of view (FOV) parameters
*/
#define SPICE_GF_MAXVRT 10000
#define SPICE_GF_CIRFOV "CIRCLE"
#define SPICE_GF_ELLFOV "ELLIPSE"
#define SPICE_GF_POLFOV "POLYGON"
#define SPICE_GF_RECFOV "RECTANGLE"
#define SPICE_GF_SHPLEN 10
#define SPICE_GF_MARGIN ( 1.e-12 )
/*
Occultation parameters
*/
#define SPICE_GF_ANNULR "ANNULAR"
#define SPICE_GF_ANY "ANY"
#define SPICE_GF_FULL "FULL"
#define SPICE_GF_PARTL "PARTIAL"
/*
Target shape parameters
*/
#define SPICE_GF_EDSHAP "ELLIPSOID"
#define SPICE_GF_PTSHAP "POINT"
#define SPICE_GF_RYSHAP "RAY"
#define SPICE_GF_SPSHAP "SPHERE"
/*
Search parameters
*/
#define SPICE_GF_ADDWIN 1.0
#define SPICE_GF_CNVTOL 1.e-6
/*
Configuration parameters.
*/
#define SPICE_GFEVNT_MAXPAR 10
#endif
/*
End of header file SpiceGF.h
*/

147
windows/inc/spice/SpiceOccult.h 100644
View File

@ -0,0 +1,147 @@
/*
-Header_File SpiceOccult.h ( CSPICE Occultation specific definitions )
-Abstract
Perform CSPICE occultation specific definitions.
-Disclaimer
THIS SOFTWARE AND ANY RELATED MATERIALS WERE CREATED BY THE
CALIFORNIA INSTITUTE OF TECHNOLOGY (CALTECH) UNDER A U.S.
GOVERNMENT CONTRACT WITH THE NATIONAL AERONAUTICS AND SPACE
ADMINISTRATION (NASA). THE SOFTWARE IS TECHNOLOGY AND SOFTWARE
PUBLICLY AVAILABLE UNDER U.S. EXPORT LAWS AND IS PROVIDED "AS-IS"
TO THE RECIPIENT WITHOUT WARRANTY OF ANY KIND, INCLUDING ANY
WARRANTIES OF PERFORMANCE OR MERCHANTABILITY OR FITNESS FOR A
PARTICULAR USE OR PURPOSE (AS SET FORTH IN UNITED STATES UCC
SECTIONS 2312-2313) OR FOR ANY PURPOSE WHATSOEVER, FOR THE
SOFTWARE AND RELATED MATERIALS, HOWEVER USED.
IN NO EVENT SHALL CALTECH, ITS JET PROPULSION LABORATORY, OR NASA
BE LIABLE FOR ANY DAMAGES AND/OR COSTS, INCLUDING, BUT NOT
LIMITED TO, INCIDENTAL OR CONSEQUENTIAL DAMAGES OF ANY KIND,
INCLUDING ECONOMIC DAMAGE OR INJURY TO PROPERTY AND LOST PROFITS,
REGARDLESS OF WHETHER CALTECH, JPL, OR NASA BE ADVISED, HAVE
REASON TO KNOW, OR, IN FACT, SHALL KNOW OF THE POSSIBILITY.
RECIPIENT BEARS ALL RISK RELATING TO QUALITY AND PERFORMANCE OF
THE SOFTWARE AND ANY RELATED MATERIALS, AND AGREES TO INDEMNIFY
CALTECH AND NASA FOR ALL THIRD-PARTY CLAIMS RESULTING FROM THE
ACTIONS OF RECIPIENT IN THE USE OF THE SOFTWARE.
-Required_Reading
None.
-Keywords
OCCULTATION
GEOMETRY
ELLIPSOID
-Exceptions
None
-Files
None
-Particulars
The following integer codes indicate the geometric relationship
of the three bodies.
The meaning of the sign of each code is given below.
Code sign Meaning
--------- ------------------------------
> 0 The second ellipsoid is
partially or fully occulted
by the first.
< 0 The first ellipsoid is
partially of fully
occulted by the second.
= 0 No occultation.
The meanings of the codes are given below. The variable names
indicate the type of occultation and which target is in the back.
For example, SPICE_OCCULT_TOTAL1 represents a total occultation in which
the first target is in the back (or occulted by) the second target.
Name Code Meaning
------ ----- ------------------------------
SPICE_OCCULT_TOTAL1 -3 Total occultation of first
target by second.
SPICE_OCCULT_ANNLR1 -2 Annular occultation of first
target by second. The second
target does not block the limb
of the first.
SPICE_OCCULT_PARTL1 -1 Partial occultation of first
target by second target.
SPICE_OCCULT_NOOCC 0 No occultation or transit: both
objects are completely visible
to the observer.
SPICE_OCCULT_PARTL2 1 Partial occultation of second
target by first target.
SPICE_OCCULT_ANNLR2 2 Annular occultation of second
target by first.
SPICE_OCCULT_TOTAL2 3 Total occultation of second
target by first.
-Examples
None
-Restrictions
None.
-Literature_References
None.
-Author_and_Institution
S.C. Krening (JPL)
N.J. Bachman (JPL)
-Version
-CSPICE Version 1.0.0, 23-FEB-2012 (SCK)
*/
#ifndef HAVE_SPICE_OCCULT_H
#define HAVE_SPICE_OCCULT_H
/*
See the Particulars section above for parameter descriptions.
*/
/*
Occultation parameters
*/
#define SPICE_OCCULT_TOTAL1 -3
#define SPICE_OCCULT_ANNLR1 -2
#define SPICE_OCCULT_PARTL1 -1
#define SPICE_OCCULT_NOOCC 0
#define SPICE_OCCULT_PARTL2 1
#define SPICE_OCCULT_ANNLR2 2
#define SPICE_OCCULT_TOTAL2 3
#endif

46
windows/inc/spice/SpiceUsr.h
View File

@ -82,11 +82,10 @@
About CSPICE function prototypes
================================
Because CSPICE function prototypes enable substantial
compile-time error checking, we recommend that user
applications always reference them. Including the header
file SpiceUsr.h in any module that calls CSPICE will
automatically make the prototypes available.
Because CSPICE function prototypes enable substantial compile-time
error checking, we recommend that user applications always reference
them. Including the header file SpiceUsr.h in any module that calls
CSPICE will automatically make the prototypes available.
About CSPICE C style
@ -112,6 +111,7 @@
-Author_and_Institution
N.J. Bachman (JPL)
S.C. Krening (JPL)
E.D. Wright (JPL)
-Restrictions
@ -123,6 +123,20 @@
-Version
-CSPICE Version 5.0.0, 11-MAY-2012 (NJB) (SCK)
Updated to include header files
SpiceErr.h
SpiceFrm.h
SpiceOccult.h
-CSPICE Version 4.0.0, 30-SEP-2008 (NJB)
Updated to include header file
SpiceGF.h
-CSPICE Version 3.0.0, 19-AUG-2002 (NJB)
Updated to include header files
@ -165,11 +179,21 @@
*/
#include "SpiceZdf.h"
/*
Include the CSPICE error handling interface definitions.
*/
#include "SpiceErr.h"
/*
Include the CSPICE EK interface definitions.
*/
#include "SpiceEK.h"
/*
Include the CSPICE frame subsystem API definitions.
*/
#include "SpiceFrm.h"
/*
Include the CSPICE Cell interface definitions.
*/
@ -184,6 +208,16 @@
Include the CSPICE SPK interface definitions.
*/
#include "SpiceSPK.h"
/*
Include the CSPICE GF interface definitions.
*/
#include "SpiceGF.h"
/*
Include the CSPICE occultation definitions.
*/
#include "SpiceOccult.h"
/*
Include CSPICE prototypes.

209
windows/inc/spice/SpiceZad.h 100644
View File

@ -0,0 +1,209 @@
/*
-Header_File SpiceZad.h ( CSPICE adapter definitions )
-Abstract
Perform CSPICE declarations to support passed-in function
adapters used in wrapper interfaces.
-Disclaimer
THIS SOFTWARE AND ANY RELATED MATERIALS WERE CREATED BY THE
CALIFORNIA INSTITUTE OF TECHNOLOGY (CALTECH) UNDER A U.S.
GOVERNMENT CONTRACT WITH THE NATIONAL AERONAUTICS AND SPACE
ADMINISTRATION (NASA). THE SOFTWARE IS TECHNOLOGY AND SOFTWARE
PUBLICLY AVAILABLE UNDER U.S. EXPORT LAWS AND IS PROVIDED "AS-IS"
TO THE RECIPIENT WITHOUT WARRANTY OF ANY KIND, INCLUDING ANY
WARRANTIES OF PERFORMANCE OR MERCHANTABILITY OR FITNESS FOR A
PARTICULAR USE OR PURPOSE (AS SET FORTH IN UNITED STATES UCC
SECTIONS 2312-2313) OR FOR ANY PURPOSE WHATSOEVER, FOR THE
SOFTWARE AND RELATED MATERIALS, HOWEVER USED.
IN NO EVENT SHALL CALTECH, ITS JET PROPULSION LABORATORY, OR NASA
BE LIABLE FOR ANY DAMAGES AND/OR COSTS, INCLUDING, BUT NOT
LIMITED TO, INCIDENTAL OR CONSEQUENTIAL DAMAGES OF ANY KIND,
INCLUDING ECONOMIC DAMAGE OR INJURY TO PROPERTY AND LOST PROFITS,
REGARDLESS OF WHETHER CALTECH, JPL, OR NASA BE ADVISED, HAVE
REASON TO KNOW, OR, IN FACT, SHALL KNOW OF THE POSSIBILITY.
RECIPIENT BEARS ALL RISK RELATING TO QUALITY AND PERFORMANCE OF
THE SOFTWARE AND ANY RELATED MATERIALS, AND AGREES TO INDEMNIFY
CALTECH AND NASA FOR ALL THIRD-PARTY CLAIMS RESULTING FROM THE
ACTIONS OF RECIPIENT IN THE USE OF THE SOFTWARE.
-Required_Reading
None.
-Particulars
This header file contains declarations used by the CSPICE
passed-in function adapter ("PFA") system. This system enables
CSPICE wrapper functions to support passed-in function
arguments whose prototypes are C-style, even when these
functions are to be called from f2c'd Fortran routines
expecting f2c-style interfaces.
This header declares:
- The prototype for the passed-in function argument
pointer storage and fetch routines
zzadsave_c
zzadget_c
- Prototypes for CSPICE adapter functions. Each passed-in
function argument in a CSPICE wrapper has a corresponding
adapter function. The adapter functions have interfaces
that match those of their f2c'd counterparts; this allows
the adapters to be called by f2c'd SPICELIB code. The
adapters look up saved function pointers for routines
passed in by the wrapper's caller and call these functions.
- Values for the enumerated type SpicePassedInFunc. These
values are used to map function pointers to the
functions they represent, enabling adapters to call
the correct passed-in functions.
Literature_References
None.
-Author_and_Institution
N.J. Bachman (JPL)
-Restrictions
None.
-Version
-CSPICE Version 2.2.0, 29-NOV-2011 (EDW)
Updated to support the user defined boolean function capability.
-CSPICE Version 2.1.0, 21-DEC-2009 (EDW)
Updated to support the user defined scalar function capability.
-CSPICE Version 2.0.0, 29-JAN-2009 (NJB)
Now conditionally includes SpiceZfc.h.
Updated to reflect new calling sequence of f2c'd
routine gfrefn_. Some header updates were made
as well.
-CSPICE Version 1.0.0, 29-MAR-2008 (NJB)
*/
/*
This file has dependencies defined in SpiceZfc.h. Include that
file if it hasn't already been included.
*/
#ifndef HAVE_SPICEF2C_H
#include "SpiceZfc.h"
#endif
#ifndef HAVE_SPICE_ZAD_H
#define HAVE_SPICE_ZAD_H
/*
Prototypes for GF adapters:
*/
logical zzadbail_c ( void );
int zzadstep_c ( doublereal * et,
doublereal * step );
int zzadrefn_c ( doublereal * t1,
doublereal * t2,
logical * s1,
logical * s2,
doublereal * t );
int zzadrepf_c ( void );
int zzadrepi_c ( doublereal * cnfine,
char * srcpre,
char * srcsuf,
ftnlen srcprelen,
ftnlen srcsuflen );
int zzadrepu_c ( doublereal * ivbeg,
doublereal * ivend,
doublereal * et );
int zzadfunc_c ( doublereal * et,
doublereal * value );
int zzadqdec_c ( U_fp udfunc,
doublereal * et,
logical * xbool );
/*
Define the enumerated type
SpicePassedInFunc
for names of passed-in functions. Using this type gives
us compile-time checking and avoids string comparisons.
*/
enum _SpicePassedInFunc {
UDBAIL,
UDREFN,
UDREPF,
UDREPI,
UDREPU,
UDSTEP,
UDFUNC,
UDQDEC,
};
typedef enum _SpicePassedInFunc SpicePassedInFunc;
/*
SPICE_N_PASSED_IN_FUNC is the count of SpicePassedInFunc values.
*/
#define SPICE_N_PASSED_IN_FUNC 8
/*
CSPICE wrappers supporting passed-in function arguments call
the adapter setup interface function once per each such argument;
these calls save the function pointers for later use within the
f2c'd code that calls passed-in functions. The saved pointers
will be used in calls by the adapter functions whose prototypes
are declared above.
Prototypes for adapter setup interface:
*/
void zzadsave_c ( SpicePassedInFunc functionID,
void * functionPtr );
void * zzadget_c ( SpicePassedInFunc functionID );
#endif
/*
End of header file SpiceZad.h
*/

53
windows/inc/spice/SpiceZdf.h
View File

@ -90,6 +90,7 @@
-Author_and_Institution
N.J. Bachman (JPL)
B.V. Semenov (JPL)
E.D. Wright (JPL)
-Restrictions
@ -98,7 +99,39 @@
-Version
-CSPICE Version 1.2.0, 27-JAN-2003 (NJB)
-CSPICE Version 6.2.0, 10-MAR-2014 (BVS)
Updated for:
PC-CYGWIN-64BIT-GCC_C
environment. Added the corresponding tag:
CSPICE_PC_CYGWIN_64BIT_GCC
tag to the #ifdefs set.
-CSPICE Version 6.1.0, 14-MAY-2010 (EDW)(BVS)
Updated for:
MAC-OSX-64BIT-INTEL_C
SUN-SOLARIS-64BIT-NATIVE_C
SUN-SOLARIS-INTEL-64BIT-CC_C
environments. Added the corresponding tags:
CSPICE_MAC_OSX_INTEL_64BIT_GCC
CSPICE_SUN_SOLARIS_64BIT_NATIVE
CSPICE_SUN_SOLARIS_INTEL_64BIT_CC
tag to the #ifdefs set.
-CSPICE Version 6.0.0, 21-FEB-2006 (NJB)
Updated to support the PC Linux 64 bit mode/gcc platform.
-CSPICE Version 5.0.0, 27-JAN-2003 (NJB)
Updated to support the Sun Solaris 64 bit mode/gcc platform.
@ -143,8 +176,13 @@
#if ( defined(CSPICE_ALPHA_DIGITAL_UNIX ) \
|| defined(CSPICE_SUN_SOLARIS_64BIT_GCC ) )
#if ( defined(CSPICE_ALPHA_DIGITAL_UNIX ) \
|| defined(CSPICE_SUN_SOLARIS_64BIT_NATIVE) \
|| defined(CSPICE_SUN_SOLARIS_64BIT_GCC ) \
|| defined(CSPICE_MAC_OSX_INTEL_64BIT_GCC ) \
|| defined(CSPICE_SUN_SOLARIS_INTEL_64BIT_CC ) \
|| defined(CSPICE_PC_CYGWIN_64BIT_GCC ) \
|| defined(CSPICE_PC_LINUX_64BIT_GCC ) )
typedef int SpiceInt;
#else
@ -157,8 +195,13 @@
typedef const float ConstSpiceFloat;
#if ( defined(CSPICE_ALPHA_DIGITAL_UNIX ) \
|| defined(CSPICE_SUN_SOLARIS_64BIT_GCC ) )
#if ( defined(CSPICE_ALPHA_DIGITAL_UNIX ) \
|| defined(CSPICE_SUN_SOLARIS_64BIT_NATIVE) \
|| defined(CSPICE_SUN_SOLARIS_64BIT_GCC ) \
|| defined(CSPICE_MAC_OSX_INTEL_64BIT_GCC ) \
|| defined(CSPICE_SUN_SOLARIS_INTEL_64BIT_CC ) \
|| defined(CSPICE_PC_CYGWIN_64BIT_GCC ) \
|| defined(CSPICE_PC_LINUX_64BIT_GCC ) )
typedef const int ConstSpiceInt;
#else

3019
windows/inc/spice/SpiceZfc.h
View File

File diff suppressed because it is too large Load Diff

375
windows/inc/spice/SpiceZim.h
View File

@ -4,10 +4,10 @@
-Abstract
Define interface macros to be called in place of CSPICE
Define interface macros to be called in place of CSPICE
user-interface-level functions. These macros are generally used
to compensate for compiler deficiencies.
-Disclaimer
THIS SOFTWARE AND ANY RELATED MATERIALS WERE CREATED BY THE
@ -43,28 +43,27 @@
-Particulars
This header file defines interface macros to be called in place of
This header file defines interface macros to be called in place of
CSPICE user-interface-level functions. Currently, the sole purpose
of these macros is to implement automatic type casting under some
of these macros is to implement automatic type casting under some
environments that generate compile-time warnings without the casts.
The typical case that causes a problem is a function argument list
containing an input formal argument of type
const double [3][3]
Under some compilers, a non-const actual argument supplied in a call
to such a function will generate a spurious warning due to the
to such a function will generate a spurious warning due to the
"mismatched" type. These macros generate type casts that will
make such compilers happy.
Examples of compilers that generate warnings of this type are
gcc version 2.2.2, hosted on NeXT workstations running
gcc version 2.2.2, hosted on NeXT workstations running
NeXTStep 3.3
Sun C compiler, version 4.2, running under Solaris.
-Author_and_Institution
N.J. Bachman (JPL)
@ -72,37 +71,73 @@
-Version
-CSPICE Version 9.0.0, 31-OCT-2005 (NJB)
-CSPICE Version 12.0.0, 03-DEC-2013 (NJB) (EDW) (SCK)
Added macros for
Added include for SpiceZrnm.h to eliminate symbol conflict
encountered from Icy and JNISpice under OS X 10.7.
Added macros for
eqncpv_c
fovray_c
spkcpo_c
spkcpt_c
spkcvo_c
spkcvt_c
spkpnv_c
spkw20_c
-CSPICE Version 11.0.0, 09-MAR-2009 (NJB) (EDW)
Added macros for
dvsep_c
gfevnt_c
gffove_c
gfrfov_c
gfsntc_c
surfpv_c
-CSPICE Version 10.0.0, 19-FEB-2008 (NJB) (EDW)
Added macros for
ilumin_c
spkaps_c
spkltc_c
-CSPICE Version 9.0.0, 31-OCT-2005 (NJB)
Added macros for
qdq2av_c
qxq_c
-CSPICE Version 8.0.0, 23-FEB-2004 (NJB)
-CSPICE Version 8.0.0, 23-FEB-2004 (NJB)
Added macro for
Added macro for
dafrs_c
-CSPICE Version 7.0.0, 23-FEB-2004 (EDW)
-CSPICE Version 7.0.0, 23-FEB-2004 (EDW)
Added macro for
Added macro for
srfxpt_c
-CSPICE Version 6.0.1, 25-FEB-2003 (EDW) (NJB)
Remove duplicate macro definitions for ekaced_c and
Remove duplicate macro definitions for ekaced_c and
ekacei_c. Visual Studio errored out when compiling
code that included SpiceZim.h.
code that included SpiceZim.h.
Added macro for
Added macro for
dasac_c
-CSPICE Version 6.0.0, 17-AUG-2002 (NJB)
-CSPICE Version 6.0.0, 17-AUG-2002 (NJB)
Added macros for
@ -130,11 +165,11 @@
reordi_c
reordl_c
spkw18_c
-CSPICE Version 5.0.0, 28-AUG-2001 (NJB)
-CSPICE Version 5.0.0, 28-AUG-2001 (NJB)
Added macros for
conics_c
illum_c
invort_c
@ -143,20 +178,20 @@
q2m_c
spkuds_c
xposeg_c
-CSPICE Version 4.0.0, 22-MAR-2000 (NJB)
-CSPICE Version 4.0.0, 22-MAR-2000 (NJB)
Added macros for
spkw12_c
spkw13_c
-CSPICE Version 3.0.0, 27-AUG-1999 (NJB) (EDW)
Fixed cut & paste error in macro nvp2pl_c.
Added macros for
axisar_c
cgv2el_c
dafps_c
@ -205,11 +240,11 @@
vzerog_c
xf2eul_c
xf2rav_c
-CSPICE Version 2.0.0, 07-MAR-1999 (NJB)
-CSPICE Version 2.0.0, 07-MAR-1999 (NJB)
Added macros for
inrypl_c
nvc2pl_c
nvp2pl_c
@ -235,10 +270,24 @@ Include Files:
*/
/*
Include the type definitions prior to defining the interface macros.
The macros reference the types.
*/
#ifndef HAVE_SPICEDEFS_H
#include "SpiceZdf.h"
#endif
/*
Include those rename assignments for routines whose symbols will
collide with other libraries.
*/
#ifndef HAVE_SPICERENAME_H
#include "SpiceZrnm.h"
#endif
#ifndef HAVE_SPICEIFMACROS_H
#define HAVE_SPICEIFMACROS_H
@ -246,7 +295,7 @@ Include Files:
/*
Macros used to abbreviate type casts:
*/
#define CONST_BOOL ( ConstSpiceBoolean * )
#define CONST_ELLIPSE ( ConstSpiceEllipse * )
#define CONST_IVEC ( ConstSpiceInt * )
@ -267,7 +316,7 @@ Macros that substitute for function calls:
#define axisar_c( axis, angle, r ) \
\
( axisar_c( CONST_VEC(axis), (angle), (r) ) )
#define bschoc_c( value, ndim, lenvals, array, order ) \
\
@ -347,11 +396,11 @@ Macros that substitute for function calls:
\
( cgv2el_c( CONST_VEC(center), CONST_VEC(vec1), \
CONST_VEC(vec2), (ellipse) ) )
#define conics_c( elts, et, state ) \
\
( conics_c( CONST_VEC(elts), (et), (state) ) )
( conics_c( CONST_VEC(elts), (et), (state) ) )
#define dafps_c( nd, ni, dc, ic, sum ) \
@ -374,7 +423,7 @@ Macros that substitute for function calls:
\
( dasac_c ( (handle), (n), (buflen), CONST_VOID(buffer) ) )
#define det_c( m1 ) \
\
( det_c ( CONST_MAT(m1) ) )
@ -382,20 +431,25 @@ Macros that substitute for function calls:
#define diags2_c( symmat, diag, rotate ) \
\
( diags2_c ( CONST_MAT2(symmat), (diag), (rotate) ) )
( diags2_c ( CONST_MAT2(symmat), (diag), (rotate) ) )
#define dvdot_c( s1, s2 ) \
\
( dvdot_c ( CONST_VEC(s1), CONST_VEC(s2) ) )
#define dvhat_c( v1, v2 ) \
\
( dvhat_c ( CONST_VEC(v1), (v2) ) )
#define dvsep_c( s1, s2 ) \
\
( dvsep_c ( CONST_VEC(s1), CONST_VEC(s2) ) )
#define edlimb_c( a, b, c, viewpt, limb ) \
\
( edlimb_c( (a), (b), (c), CONST_VEC(viewpt), (limb) ) )
@ -406,21 +460,21 @@ Macros that substitute for function calls:
\
( ekacec_c( (handle), (segno), (recno), CONST_STR(column), \
(nvals), (vallen), CONST_VOID(cvals), \
(isnull) ) )
(isnull) ) )
#define ekaced_c( handle, segno, recno, column, nvals, \
dvals, isnull ) \
\
( ekaced_c( (handle), (segno), (recno), CONST_STR(column), \
(nvals), CONST_VEC(dvals), (isnull) ) )
(nvals), CONST_VEC(dvals), (isnull) ) )
#define ekacei_c( handle, segno, recno, column, nvals, \
ivals, isnull ) \
\
( ekacei_c( (handle), (segno), (recno), CONST_STR(column), \
(nvals), CONST_IVEC(ivals), (isnull) ) )
(nvals), CONST_IVEC(ivals), (isnull) ) )
#define ekaclc_c( handle, segno, column, vallen, cvals, entszs, \
@ -429,7 +483,7 @@ Macros that substitute for function calls:
( ekaclc_c( (handle), (segno), (column), (vallen), \
CONST_VOID(cvals), CONST_IVEC(entszs), \
CONST_BOOL(nlflgs), CONST_IVEC(rcptrs), \
(wkindx) ) )
(wkindx) ) )
#define ekacld_c( handle, segno, column, dvals, entszs, nlflgs, \
@ -438,7 +492,7 @@ Macros that substitute for function calls:
( ekacld_c( (handle), (segno), (column), \
CONST_VEC(dvals), CONST_IVEC(entszs), \
CONST_BOOL(nlflgs), CONST_IVEC(rcptrs), \
(wkindx) ) )
(wkindx) ) )
#define ekacli_c( handle, segno, column, ivals, entszs, nlflgs, \
@ -447,7 +501,7 @@ Macros that substitute for function calls:
( ekacli_c( (handle), (segno), (column), \
CONST_IVEC(ivals), CONST_IVEC(entszs), \
CONST_BOOL(nlflgs), CONST_IVEC(rcptrs), \
(wkindx) ) )
(wkindx) ) )
#define ekbseg_c( handle, tabnam, ncols, cnmlen, cnames, declen, \
@ -455,7 +509,7 @@ Macros that substitute for function calls:
\
( ekbseg_c( (handle), (tabnam), (ncols), (cnmlen), \
CONST_VOID(cnames), (declen), \
CONST_VOID(decls), (segno) ) )
CONST_VOID(decls), (segno) ) )
#define ekifld_c( handle, tabnam, ncols, nrows, cnmlen, cnames, \
@ -463,7 +517,7 @@ Macros that substitute for function calls:
\
( ekifld_c( (handle), (tabnam), (ncols), (nrows), (cnmlen), \
CONST_VOID(cnames), (declen), \
CONST_VOID(decls), (segno), (rcptrs) ) )
CONST_VOID(decls), (segno), (rcptrs) ) )
#define ekucec_c( handle, segno, recno, column, nvals, vallen, \
@ -471,20 +525,20 @@ Macros that substitute for function calls:
\
( ekucec_c( (handle), (segno), (recno), CONST_STR(column), \
(nvals), (vallen), CONST_VOID(cvals), \
(isnull) ) )
(isnull) ) )
#define ekuced_c( handle, segno, recno, column, nvals, \
dvals, isnull ) \
\
( ekuced_c( (handle), (segno), (recno), CONST_STR(column), \
(nvals), CONST_VOID(dvals), (isnull) ) )
(nvals), CONST_VOID(dvals), (isnull) ) )
#define ekucei_c( handle, segno, recno, column, nvals, \
ivals, isnull ) \
\
( ekucei_c( (handle), (segno), (recno), CONST_STR(column), \
(nvals), CONST_VOID(ivals), (isnull) ) )
(nvals), CONST_VOID(ivals), (isnull) ) )
#define el2cgv_c( ellipse, center, smajor, sminor ) \
@ -493,6 +547,12 @@ Macros that substitute for function calls:
(smajor), (sminor) ) )
#define eqncpv_c( et, epoch, eqel, rapol, decpol, state ) \
\
( eqncpv_c ( (et), (epoch), CONST_VEC(eqel), (rapol), \
(decpol), (state) ) )
#define esrchc_c( value, ndim, lenvals, array ) \
\
( esrchc_c ( CONST_STR(value), (ndim), (lenvals), \
@ -503,12 +563,66 @@ Macros that substitute for function calls:
\
( eul2xf_c ( CONST_VEC(eulang), (axisa), (axisb), (axisc), \
(xform) ) )
#define fovray_c( inst, raydir, rframe, abcorr, observer, \
et, visible ) \
\
( fovray_c( (inst), CONST_VEC(raydir), (rframe), \
(abcorr), (observer), (et), (visible) ) )
#define getelm_c( frstyr, lineln, lines, epoch, elems ) \
\
( getelm_c ( (frstyr), (lineln), CONST_VOID(lines), \
(epoch), (elems) ) )
(epoch), (elems) ) )
#define gfevnt_c( udstep, udrefn, gquant, qnpars, lenvals, \
qpnams, qcpars, qdpars, qipars, qlpars, \
op, refval, tol, adjust, rpt, \
udrepi, udrepu, udrepf, nintvls, \
bail, udbail, cnfine, result ) \
\
( gfevnt_c( (udstep), (udrefn), (gquant), \
(qnpars), (lenvals), CONST_VOID(qpnams),\
CONST_VOID(qcpars), (qdpars), (qipars), \
(qlpars), (op), (refval), \
(tol), (adjust), (rpt), \
(udrepi), (udrepu), (udrepf), \
(nintvls), (bail), \
(udbail), (cnfine), (result) ) )
#define gffove_c( inst, tshape, raydir, target, tframe, \
abcorr, obsrvr, tol, udstep, udrefn, \
rpt, udrepi, udrepu, udrepf, bail, \
udbail, cnfine, result ) \
\
( gffove_c( (inst), (tshape), CONST_VEC(raydir), \
(target), (tframe), (abcorr), \
(obsrvr), (tol), (udstep), \
(udrefn), (rpt), (udrepi), \
(udrepu), (udrepf), (bail), \
(udbail), (cnfine), (result) ) )
#define gfrfov_c( inst, raydir, rframe, abcorr, obsrvr, \
step, cnfine, result ) \
\
( gfrfov_c( (inst), CONST_VEC(raydir), (rframe), \
(abcorr), (obsrvr), (step), \
(cnfine), (result) ) )
#define gfsntc_c( target, fixref, method, abcorr, obsrvr, \
dref, dvec, crdsys, coord, relate, \
refval, adjust, step, nintvls, cnfine, \
result ) \
\
( gfsntc_c( (target), (fixref), (method), \
(abcorr), (obsrvr), (dref), \
CONST_VEC(dvec), (crdsys), (coord), \
(relate), (refval), (adjust), \
(step), (nintvls), (cnfine), (result) ) )
#define illum_c( target, et, abcorr, obsrvr, \
@ -517,7 +631,16 @@ Macros that substitute for function calls:
( illum_c ( (target), (et), (abcorr), (obsrvr), \
CONST_VEC(spoint), (phase), (solar), (emissn) ) )
#define ilumin_c( method, target, et, fixref, \
abcorr, obsrvr, spoint, trgepc, \
srfvec, phase, solar, emissn ) \
\
( ilumin_c ( (method), (target), (et), (fixref), \
(abcorr), (obsrvr), CONST_VEC(spoint), (trgepc), \
(srfvec), (phase), (solar), (emissn) ) )
#define inedpl_c( a, b, c, plane, ellipse, found ) \
\
( inedpl_c ( (a), (b), (c), \
@ -528,7 +651,7 @@ Macros that substitute for function calls:
\
( inrypl_c ( CONST_VEC(vertex), CONST_VEC(dir), \
CONST_PLANE(plane), (nxpts), (xpt) ) )
#define invert_c( m1, m2 ) \
\
@ -563,8 +686,8 @@ Macros that substitute for function calls:
#define isrot_c( m, ntol, dtol ) \
\
( isrot_c ( CONST_MAT(m), (ntol), (dtol) ) )
#define lmpool_c( cvals, lenvals, n ) \
\
( lmpool_c( CONST_VOID(cvals), (lenvals), (n) ) )
@ -606,22 +729,22 @@ Macros that substitute for function calls:
angle3, angle2, angle1 ) \
\
( m2eul_c ( CONST_MAT(r), (axis3), (axis2), (axis1), \
(angle3), (angle2), (angle1) ) )
(angle3), (angle2), (angle1) ) )
#define m2q_c( r, q ) \
\
( m2q_c ( CONST_MAT(r), (q) ) )
#define mequ_c( m1, m2 ) \
\
( mequ_c ( CONST_MAT(m1), m2 ) )
#define mequg_c( m1, nr, nc, mout ) \
\
( mequg_c ( CONST_MAT(m1), (nr), (nc), mout ) )
#define mtxm_c( m1, m2, mout ) \
\
@ -694,8 +817,8 @@ Macros that substitute for function calls:
\
( nplnpt_c ( CONST_VEC(linpt), CONST_VEC(lindir), \
CONST_VEC(point), (pnear), (dist ) ) )
#define nvc2pl_c( normal, constant, plane ) \
\
( nvc2pl_c ( CONST_VEC(normal), (constant), (plane) ) )
@ -785,13 +908,13 @@ Macros that substitute for function calls:
#define rav2xf_c( rot, av, xform ) \
\
( rav2xf_c ( CONST_MAT(rot), CONST_VEC(av), (xform) ) )
#define raxisa_c( matrix, axis, angle ) \
\
( raxisa_c ( CONST_MAT(matrix), (axis), (angle) ) );
( raxisa_c ( CONST_MAT(matrix), (axis), (angle) ) );
#define reccyl_c( rectan, r, lon, z ) \
\
( reccyl_c ( CONST_VEC(rectan), (r), (lon), (z) ) )
@ -851,9 +974,9 @@ Macros that substitute for function calls:
#define spk14a_c( handle, ncsets, coeffs, epochs ) \
\
( spk14a_c ( (handle), (ncsets), \
CONST_VEC(coeffs), CONST_VEC(epochs) ) )
CONST_VEC(coeffs), CONST_VEC(epochs) ) )
#define spkapo_c( targ, et, ref, sobs, abcorr, ptarg, lt ) \
\
( spkapo_c ( (targ), (et), (ref), CONST_VEC(sobs), \
@ -866,6 +989,61 @@ Macros that substitute for function calls:
(abcorr), (starg), (lt) ) )
#define spkaps_c( targ, et, ref, abcorr, sobs, \
accobs, starg, lt, dlt ) \
\
( spkaps_c ( (targ), (et), (ref), (abcorr), \
CONST_VEC(sobs), CONST_VEC(accobs), \
(starg), (lt), (dlt) ) )
#define spkcpo_c( target, et, outref, refloc, \
abcorr, obspos, obsctr, \
obsref, state, lt ) \
\
( spkcpo_c( (target), (et), (outref), (refloc), \
(abcorr), CONST_VEC(obspos), (obsctr), \
(obsref), (state), (lt) ) )
#define spkcpt_c( trgpos, trgctr, trgref, \
et, outref, refloc, abcorr, \
obsrvr, state, lt ) \
\
( spkcpt_c( CONST_VEC(trgpos), (trgctr), (trgref), \
(et), (outref), (refloc), (abcorr), \
(obsrvr), (state), (lt) ) )
#define spkcvo_c( target, et, outref, refloc, \
abcorr, obssta, obsepc, obsctr, \
obsref, state, lt ) \
\
( spkcvo_c( (target), (et), (outref), (refloc), \
(abcorr), CONST_VEC(obssta), (obsepc), \
(obsctr), (obsref), (state), (lt) ) )
#define spkcvt_c( trgsta, trgepc, trgctr, trgref, \
et, outref, refloc, abcorr, \
obsrvr, state, lt ) \
\
( spkcvt_c( CONST_VEC(trgsta), (trgepc), (trgctr), \
(trgref), (et), (outref), (refloc), \
(abcorr), (obsrvr), (state), (lt) ) )
#define spkltc_c( targ, et, ref, abcorr, sobs, starg, lt, dlt ) \
\
( spkltc_c ( (targ), (et), (ref), (abcorr), \
CONST_VEC(sobs), (starg), (lt), (dlt) ) )
#define spkpvn_c( handle, descr, et, ref, state, center ) \
\
( spkpvn_c ( (handle), CONST_VEC(descr), (et), \
(ref), (state), (center) ) )
#define spkuds_c( descr, body, center, frame, type, \
first, last, begin, end ) \
\
@ -972,6 +1150,17 @@ Macros that substitute for function calls:
CONST_VOID(packts), CONST_VEC(epochs) ) )
#define spkw20_c( handle, body, center, frame, first, last, \
segid, intlen, n, polydg, cdata, dscale, \
tscale, initjd, initfr ) \
\
( spkw20_c ( (handle), (body), (center), (frame), \
(first), (last), (segid), (intlen), \
(n), (polydg), CONST_VEC(cdata), (dscale), \
(tscale), (initjd), (initfr) ) )
#define srfxpt_c( method, target, et, abcorr, obsrvr, dref, \
dvec, spoint, dist, trgepc, obspos, found ) \
\
@ -1007,6 +1196,13 @@ Macros that substitute for function calls:
(point), (found) ) )
#define surfpv_c( stvrtx, stdir, a, b, c, stx, found ) \
\
( surfpv_c ( CONST_VEC(stvrtx), CONST_VEC(stdir), \
(a), (b), (c), \
(stx), (found) ) )
#define swpool_c( agent, nnames, lenvals, names ) \
\
( swpool_c( CONST_STR(agent), (nnames), \
@ -1047,7 +1243,7 @@ Macros that substitute for function calls:
#define vaddg_c( v1, v2, ndim,vout ) \
\
( vaddg_c ( CONST_VEC(v1), CONST_VEC(v2), (ndim), (vout) ) )
#define vcrss_c( v1, v2, vout ) \
\
@ -1116,8 +1312,8 @@ Macros that substitute for function calls:
#define vminug_c( v1, ndim, vout ) \
\
( vminug_c ( CONST_VEC(v1), (ndim), (vout) ) )
#define vminus_c( v1, vout ) \
\
( vminus_c ( CONST_VEC(v1), (vout) ) )
@ -1157,8 +1353,8 @@ Macros that substitute for function calls:
#define vrel_c( v1, v2 ) \
\
( vrel_c ( CONST_VEC(v1), CONST_VEC(v2) ) )
#define vrelg_c( v1, v2, ndim ) \
\
( vrelg_c ( CONST_VEC(v1), CONST_VEC(v2), (ndim) ) )
@ -1187,8 +1383,8 @@ Macros that substitute for function calls:
#define vsepg_c( v1, v2, ndim) \
\
( vsepg_c ( CONST_VEC(v1), CONST_VEC(v2), ndim ) )
#define vsub_c( v1, v2, vout ) \
\
( vsub_c ( CONST_VEC(v1), CONST_VEC(v2), (vout) ) )
@ -1202,8 +1398,8 @@ Macros that substitute for function calls:
#define vtmv_c( v1, mat, v2 ) \
\
( vtmv_c ( CONST_VEC(v1), CONST_MAT(mat), CONST_VEC(v2) ) )
#define vtmvg_c( v1, mat, v2, nrow, ncol ) \
\
( vtmvg_c ( CONST_VOID(v1), CONST_VOID(mat), CONST_VOID(v2), \
@ -1228,12 +1424,12 @@ Macros that substitute for function calls:
#define xf2eul_c( xform, axisa, axisb, axisc, eulang, unique ) \
\
( xf2eul_c( CONST_MAT6(xform), (axisa), (axisb), (axisc), \
(eulang), (unique) ) )
(eulang), (unique) ) )
#define xf2rav_c( xform, rot, av ) \
\
( xf2rav_c( CONST_MAT6(xform), (rot), (av) ) )
( xf2rav_c( CONST_MAT6(xform), (rot), (av) ) )
#define xpose6_c( m1, mout ) \
@ -1252,4 +1448,3 @@ Macros that substitute for function calls:
#endif

7
windows/inc/spice/SpiceZmc.h
View File

@ -88,6 +88,11 @@
-Version
-CSPICE Version 4.3.0, 18-SEP-2013 (NJB)
Bug fix: missing comma was added to argument list
in body of macro CELLTYPECHK3_VAL.
-CSPICE Version 4.2.0, 16-FEB-2005 (NJB)
Bug fix: in the macro C2F_MAP_CELL, error checking has been
@ -645,7 +650,7 @@ use CHKOSTR_VAL, which is defined below.
retval ); \
CELLTYPECHK_VAL( errHandling, modname, dtype, cellPtr2, \
retval ); \
CELLTYPECHK_VAL( errHandling, modname, dtype, cellPtr3 \
CELLTYPECHK_VAL( errHandling, modname, dtype, cellPtr3, \
retval );

34
windows/inc/spice/SpiceZpl.h
View File

@ -58,6 +58,34 @@
-Version
-CSPICE Version 2.1.0, 10-MAR-2014 (BVS)
Updated for the:
PC-CYGWIN-64BIT-GCC_C
environment.
-CSPICE Version 2.2.0, 14-MAY-2010 (EDW)(BVS)
Updated for the:
MAC-OSX-64BIT-INTEL_C
PC-64BIT-MS_C
SUN-SOLARIS-64BIT-NATIVE_C
SUN-SOLARIS-INTEL-64BIT-CC_C
SUN-SOLARIS-INTEL-CC_C
environments.
-CSPICE Version 2.1.0, 15-NOV-2006 (BVS)
Updated for MAC-OSX-INTEL_C environment.
-CSPICE Version 2.0.0, 21-FEB-2006 (NJB)
Updated for PC-LINUX-64BIT-GCC_C environment.
-CSPICE Version 1.3.0, 06-MAR-2005 (NJB)
Updated for SUN-SOLARIS-64BIT-GCC_C environment.
@ -74,16 +102,16 @@
-Index_Entries
platform ID macros for CSPICE
platform ID defines for CSPICE
*/
#ifndef HAVE_PLATFORM_MACROS_H
#ifndef HAVE_PLATFORM_MACROS_H
#define HAVE_PLATFORM_MACROS_H
#define CSPICE_PC_MS
#define CSPICE_PC_64BIT_MS
#endif

1498
windows/inc/spice/SpiceZpr.h
View File

File diff suppressed because it is too large Load Diff

82
windows/inc/spice/SpiceZrnm.h 100644
View File

@ -0,0 +1,82 @@
/*
-Header_File SpiceZrnm.h ( CSPICE rename assignments )
-Abstract
Reassign CSPICE symbol names to prevent symbol collisions.
-Disclaimer
THIS SOFTWARE AND ANY RELATED MATERIALS WERE CREATED BY THE
CALIFORNIA INSTITUTE OF TECHNOLOGY (CALTECH) UNDER A U.S.
GOVERNMENT CONTRACT WITH THE NATIONAL AERONAUTICS AND SPACE
ADMINISTRATION (NASA). THE SOFTWARE IS TECHNOLOGY AND SOFTWARE
PUBLICLY AVAILABLE UNDER U.S. EXPORT LAWS AND IS PROVIDED "AS-IS"
TO THE RECIPIENT WITHOUT WARRANTY OF ANY KIND, INCLUDING ANY
WARRANTIES OF PERFORMANCE OR MERCHANTABILITY OR FITNESS FOR A
PARTICULAR USE OR PURPOSE (AS SET FORTH IN UNITED STATES UCC
SECTIONS 2312-2313) OR FOR ANY PURPOSE WHATSOEVER, FOR THE
SOFTWARE AND RELATED MATERIALS, HOWEVER USED.
IN NO EVENT SHALL CALTECH, ITS JET PROPULSION LABORATORY, OR NASA
BE LIABLE FOR ANY DAMAGES AND/OR COSTS, INCLUDING, BUT NOT
LIMITED TO, INCIDENTAL OR CONSEQUENTIAL DAMAGES OF ANY KIND,
INCLUDING ECONOMIC DAMAGE OR INJURY TO PROPERTY AND LOST PROFITS,
REGARDLESS OF WHETHER CALTECH, JPL, OR NASA BE ADVISED, HAVE
REASON TO KNOW, OR, IN FACT, SHALL KNOW OF THE POSSIBILITY.
RECIPIENT BEARS ALL RISK RELATING TO QUALITY AND PERFORMANCE OF
THE SOFTWARE AND ANY RELATED MATERIALS, AND AGREES TO INDEMNIFY
CALTECH AND NASA FOR ALL THIRD-PARTY CLAIMS RESULTING FROM THE
ACTIONS OF RECIPIENT IN THE USE OF THE SOFTWARE.
-Required_Reading
None.
-Literature_References
None.
-Particulars
Compiled symbol names in CSPICE may collide with symbols in other,
non-SPICE libraries. This file redefines names which have or may
cause a collision.
-Author_and_Institution
N.J. Bachman (JPL)
E.D. Wright (JPL)
-Version
-CSPICE Version 1.0.0, 17-OCT-2011 (EDW)
-Index_Entries
Rename assignments for CSPICE functions
*/
#ifndef HAVE_SPICERENAME_H
/*
Redefine names causing symbol conflicts:
*/
#define HAVE_SPICERENAME_H
/* dpstrf_ may exist in the LAPACK library. */
#define dpstrf_ zz_dpstrf_
/* Just in case. */
#define pi_ zz_pi_
#define vnorm_ zz_vnorm_
#define vdist_ zz_vdist_
#endif

115
windows/inc/spice/f2c.h
View File

@ -44,7 +44,7 @@
Fortran data types to native C data types. For example, Fortran
INTEGER variables are mapped to variables of type integer, where
integer is a C typedef. In the standard f2c.h header, the typedef
integer tranlates to the C type long.
integer translates to the C type long.
Because the standard version of f2c.h does not work on all platforms,
this header file contains two platform-dependent versions of it,
@ -79,14 +79,6 @@
# endif
-Literature_References
None.
-Author_and_Institution
N.J. Bachman (JPL)
-Restrictions
1) This header file must be updated whenever the f2c processor
@ -105,9 +97,58 @@
SGI-IRIX-NO2
SUN-SOLARIS
-Literature_References
None.
-Author_and_Institution
N.J. Bachman (JPL)
B.V. Semenov (JPL)
E.D. Wright (JPL)
-Version
-CSPICE Version 1.2.0, 27-JAN-2003 (NJB)
-CSPICE Version 4.2.0, 09-APR-2014 (EDW) (BVS)
Added include for SpiceZrnm.h to eliminate symbol conflict
encountered from Icy and JNISpice under OS X 10.7.
Minor text format correction to eliminate error signal from
OS X cpp. The edit removes leading whitespace from the
final "#endif".
Updated for:
PC-CYGWIN-64BIT-GCC_C
environment. Added the corresponding tag:
CSPICE_PC_CYGWIN_64BIT_GCC
tag to the #ifdefs set.
-CSPICE Version 4.1.0, 14-MAY-2010 (EDW)(BVS)
Updated for:
MAC-OSX-64BIT-INTEL_C
SUN-SOLARIS-64BIT-NATIVE_C
SUN-SOLARIS-INTEL-64BIT-CC_C
environments. Added the corresponding tags:
CSPICE_MAC_OSX_INTEL_64BIT_GCC
CSPICE_SUN_SOLARIS_64BIT_NATIVE
CSPICE_SUN_SOLARIS_INTEL_64BIT_CC
tag to the #ifdefs set.
-CSPICE Version 4.0.0, 21-FEB-2006 (NJB)
Updated to support the PC Linux 64 bit mode/gcc platform.
-CSPICE Version 3.0.0, 27-JAN-2003 (NJB)
Updated to support the Sun Solaris 64 bit mode/gcc platform.
@ -132,12 +173,21 @@
*/
/*
Optionally include name-mangling macros for f2c external symbols.
*/
#ifdef MIX_C_AND_FORTRAN
#include "f2cMang.h"
#endif
/*
Include those rename assignments for routines whose symbols will
collide with other libraries.
*/
#ifndef HAVE_SPICERENAME_H
#include "SpiceZrnm.h"
#endif
/*
Optionally include name-mangling macros for f2c external symbols.
*/
#ifdef MIX_C_AND_FORTRAN
#include "f2cMang.h"
#endif
/*
@ -146,15 +196,20 @@
#include "SpiceZpl.h"
# if ( defined(CSPICE_ALPHA_DIGITAL_UNIX ) \
|| defined(CSPICE_SUN_SOLARIS_64BIT_GCC ) )
#if ( defined(CSPICE_ALPHA_DIGITAL_UNIX ) \
|| defined(CSPICE_SUN_SOLARIS_64BIT_GCC ) \
|| defined(CSPICE_SUN_SOLARIS_64BIT_NATIVE ) \
|| defined(CSPICE_MAC_OSX_INTEL_64BIT_GCC ) \
|| defined(CSPICE_SUN_SOLARIS_INTEL_64BIT_CC ) \
|| defined(CSPICE_PC_CYGWIN_64BIT_GCC ) \
|| defined(CSPICE_PC_LINUX_64BIT_GCC ) )
/*
The following code is intended to be used on the Alpha/Digital Unix
platform, where a long is the size of a double and an int is half the
MODIFICATION
The following code is intended to be used on the platforms where
a long is the size of a double and an int is half the
size of a double.
Note that the comment line below indicating that the header is
@ -168,10 +223,6 @@
/* f2c.h -- Standard Fortran to C header file */
/** barf [ba:rf] 2. "He suggested using FORTRAN, and everybody barfed."
- From The Shogakukan DICTIONARY OF NEW ENGLISH (Second edition) */
#ifndef F2C_INCLUDE
#define F2C_INCLUDE
@ -392,11 +443,9 @@ typedef doublereal E_f; /* real function with -R not specified */
/*
This marks the end of the Alpha/Digital Unix version of f2c.h.
This marks the end of the MODIFICATION section version of f2c.h.
*/
#else
/*
@ -408,12 +457,8 @@ typedef doublereal E_f; /* real function with -R not specified */
*/
/* f2c.h -- Standard Fortran to C header file */
/** barf [ba:rf] 2. "He suggested using FORTRAN, and everybody barfed."
- From The Shogakukan DICTIONARY OF NEW ENGLISH (Second edition) */
#ifndef F2C_INCLUDE
#define F2C_INCLUDE
@ -634,5 +679,5 @@ typedef doublereal E_f; /* real function with -R not specified */
#endif
#endif
#endif

9
windows/inc/spice/f2cMang.h
View File

@ -87,11 +87,16 @@
the standard f2c external symbols.
3) The features implemented by this header have been tested only
under the Sun Solaris GCC and Sun Solaris native ANSI C
environments.
under the Sun Solaris GCC, Sun Solaris native ANSI C, and
PC/Linux/gcc environments.
-Version
-CSPICE Version 2.0.1, 07-MAR-2009 (NJB)
Restrictions header section was updated to note successful
testing on the PC/Linux/gcc platform.
-CSPICE Version 2.0.0, 19-DEC-2001 (NJB)
*/

22
windows/inc/spice/zzalloc.h
View File

@ -42,6 +42,7 @@
Prototypes in this file:
alloc_count
zzalloc_count
alloc_SpiceMemory
alloc_SpiceString_C_array
alloc_SpiceString_C_Copy_array
@ -54,6 +55,15 @@
-Version
CSPICE 1.0.3 02-MAY-2008 (EDW)
Added alloc_count prototype.
CSPICE 1.0.2 10-MAY-2007 (EDW)
Minor edits to clarify 'size' in alloc_SpiceMemory as
size_t.
CSPICE 1.0.1 23-JUN-2005 (EDW)
Add prototype for alloc_SpiceString_Pointer_array, allocate
@ -68,8 +78,10 @@
#ifndef ZZALLOC_H
#define ZZALLOC_H
/* Allocation call prototypes: */
int alloc_count ( SpiceChar* op );
/*
Allocation call prototypes:
*/
int alloc_count ();
SpiceChar ** alloc_SpiceString_C_array ( int string_length,
int string_count );
@ -91,7 +103,7 @@
void free_SpiceString_C_array ( int dim,
SpiceChar ** array );
void * alloc_SpiceMemory ( unsigned size );
void * alloc_SpiceMemory ( size_t size );
void free_SpiceMemory ( void * ptr );
@ -101,11 +113,11 @@
Note, the need to use this macro exists only in those routines
allocating/deallocating memory.
*/
#define ALLOC_CHECK if ( alloc_count( "=" ) != 0 ) \
#define ALLOC_CHECK if ( alloc_count() != 0 ) \
{ \
setmsg_c ( "Malloc/Free count not zero at end of routine." \
" Malloc count = #."); \
errint_c ( "#", alloc_count ( "=" ) ); \
errint_c ( "#", alloc_count() ); \
sigerr_c ( "SPICE(MALLOCCOUNT)" ); \
}

12
windows/inc/spice/zzerror.h
View File

@ -62,7 +62,13 @@
-Version
CSPICE 1.0.0 17-OCT-2005 (EDW)
-CSPICE 1.1.0 14-JAN-2013 (EDW)
Added parameter:
SCALAR_OP
-CSPICE 1.0.0 17-OCT-2005 (EDW)
Initial release.
@ -74,7 +80,7 @@
const char * zzerror( long cnt );
void zzerrorinit();
#define SCALAR_OP -1
#endif

BIN
windows/lib/x64/cspice64.lib 100644
View File

Binary file not shown.

BIN
windows/lib/x64/libiconv.lib 100644
View File

Binary file not shown.

BIN
windows/lib/x64/libintl.lib 100644
View File

Binary file not shown.

BIN
windows/lib/x64/libjpeg.lib 100644
View File

Binary file not shown.

BIN
windows/lib/x64/libpng.lib 100644
View File

Binary file not shown.

BIN
windows/lib/x64/lua51.lib 100644
View File

Binary file not shown.

BIN
windows/lib/x64/zlib.lib 100644
View File

Binary file not shown.

BIN
windows/lib/x86/csupport.lib 100644
View File

Binary file not shown.

BIN
windows/lib/x86/intl.lib
View File

Binary file not shown.

BIN
windows/lib/x86/libiconv.lib 100644
View File

Binary file not shown.

BIN
windows/lib/x86/libintl.lib 100644
View File

Binary file not shown.

BIN
windows/lib/x86/libjpeg.lib
View File

Binary file not shown.

BIN
windows/lib/x86/libpng.lib
View File

Binary file not shown.

BIN
windows/lib/x86/libpngd.lib
View File

Binary file not shown.

BIN
windows/lib/x86/lua5.1.lib
View File

Binary file not shown.

BIN
windows/lib/x86/lua51.lib 100644
View File

Binary file not shown.

BIN
windows/lib/x86/zlib.lib
View File

Binary file not shown.

BIN
windows/lib/x86/zlibd.lib
View File

Binary file not shown.