Skip to content

Commit c1c6dc6

Browse files
kanaitkanait
committed
x64 build supported on VS2019.
1 parent 2b04945 commit c1c6dc6

File tree

4 files changed

+81
-3
lines changed

4 files changed

+81
-3
lines changed

‎bspsgpu-vs2019.sln‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,19 @@ EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|Win32 = Debug|Win32
11+
Debug|x64 = Debug|x64
1112
Release|Win32 = Release|Win32
13+
Release|x64 = Release|x64
1214
EndGlobalSection
1315
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1416
{61E69543-3EF3-4AE4-AC7E-E45C8C955D39}.Debug|Win32.ActiveCfg = Debug|Win32
1517
{61E69543-3EF3-4AE4-AC7E-E45C8C955D39}.Debug|Win32.Build.0 = Debug|Win32
18+
{61E69543-3EF3-4AE4-AC7E-E45C8C955D39}.Debug|x64.ActiveCfg = Debug|x64
19+
{61E69543-3EF3-4AE4-AC7E-E45C8C955D39}.Debug|x64.Build.0 = Debug|x64
1620
{61E69543-3EF3-4AE4-AC7E-E45C8C955D39}.Release|Win32.ActiveCfg = Release|Win32
1721
{61E69543-3EF3-4AE4-AC7E-E45C8C955D39}.Release|Win32.Build.0 = Release|Win32
22+
{61E69543-3EF3-4AE4-AC7E-E45C8C955D39}.Release|x64.ActiveCfg = Release|x64
23+
{61E69543-3EF3-4AE4-AC7E-E45C8C955D39}.Release|x64.Build.0 = Release|x64
1824
EndGlobalSection
1925
GlobalSection(SolutionProperties) = preSolution
2026
HideSolutionNode = FALSE

‎bspsgpu.vcxproj‎

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,18 @@
55
<Configuration>Debug</Configuration>
66
<Platform>Win32</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Release|Win32">
913
<Configuration>Release</Configuration>
1014
<Platform>Win32</Platform>
1115
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
1220
</ItemGroup>
1321
<PropertyGroup Label="Globals">
1422
<ProjectGuid>{61E69543-3EF3-4AE4-AC7E-E45C8C955D39}</ProjectGuid>
@@ -20,31 +28,51 @@
2028
<CharacterSet>MultiByte</CharacterSet>
2129
<PlatformToolset>v142</PlatformToolset>
2230
</PropertyGroup>
31+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
32+
<ConfigurationType>Application</ConfigurationType>
33+
<CharacterSet>MultiByte</CharacterSet>
34+
<PlatformToolset>v142</PlatformToolset>
35+
</PropertyGroup>
2336
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2437
<ConfigurationType>Application</ConfigurationType>
2538
<CharacterSet>MultiByte</CharacterSet>
2639
<PlatformToolset>v142</PlatformToolset>
2740
</PropertyGroup>
41+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42+
<ConfigurationType>Application</ConfigurationType>
43+
<CharacterSet>MultiByte</CharacterSet>
44+
<PlatformToolset>v142</PlatformToolset>
45+
</PropertyGroup>
2846
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
2947
<ImportGroup Label="ExtensionSettings">
3048
</ImportGroup>
3149
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
3250
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3351
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
3452
</ImportGroup>
53+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
54+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
55+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
56+
</ImportGroup>
3557
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
3658
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3759
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
3860
</ImportGroup>
61+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
62+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
64+
</ImportGroup>
3965
<PropertyGroup Label="UserMacros" />
4066
<PropertyGroup>
4167
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
4268
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>
4369
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
4470
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
71+
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
4572
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
4673
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
4774
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
75+
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
4876
</PropertyGroup>
4977
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5078
<ClCompile>
@@ -69,6 +97,27 @@
6997
<TargetMachine>MachineX86</TargetMachine>
7098
</Link>
7199
</ItemDefinitionGroup>
100+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
101+
<ClCompile>
102+
<Optimization>Disabled</Optimization>
103+
<AdditionalIncludeDirectories>..\opennurbs;..\megapoly\util;..\megapoly\include\vecmath-c++-1.2-1.4;..\megapoly\include;..\megapoly\meshL;..\megapoly\meshA;..\megapoly\render;..\megapoly\lib\libpng-1.2.5\include;..\megapoly\lib\zlib-1.2.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
104+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
105+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
106+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
107+
<PrecompiledHeader>
108+
</PrecompiledHeader>
109+
<WarningLevel>Level3</WarningLevel>
110+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
111+
</ClCompile>
112+
<Link>
113+
<AdditionalDependencies>render.lib;meshL.lib;meshA.lib;libpng.lib;zlib.lib;opennurbs_static.lib;glut32.lib;glu32.lib;opengl32.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
114+
<OutputFile>$(OutDir)nurbcgpu.exe</OutputFile>
115+
<AdditionalLibraryDirectories>..\opennurbs\ReleaseStaticLib;..\megapoly\lib\libpng-1.2.5\lib;..\megapoly\lib\zlib-1.2.1\lib;..\megapoly\meshL\debug;..\megapoly\meshA\debug;..\megapoly\render\debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
116+
<GenerateDebugInformation>true</GenerateDebugInformation>
117+
<ProgramDatabaseFile>$(OutDir)nurbcgpu.pdb</ProgramDatabaseFile>
118+
<SubSystem>Console</SubSystem>
119+
</Link>
120+
</ItemDefinitionGroup>
72121
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
73122
<ClCompile>
74123
<AdditionalIncludeDirectories>..\opennurbs;.\render;.\vecmath-c++-1.2-1.4;..\lib\libpng-1.6.16\include;..\lib\zlib-1.2.8;..\lib\inc;..\lib\Cg\include;..\lib\glew-1.7.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -81,7 +130,7 @@
81130
</ClCompile>
82131
<Link>
83132
<AdditionalDependencies>glew32.lib;cg.lib;cgGL.lib;libpng16.lib;zlib.lib;opennurbs_static.lib;glut32.lib;glu32.lib;opengl32.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
84-
<OutputFile>bspsgpu.exe</OutputFile>
133+
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
85134
<AdditionalLibraryDirectories>..\lib\Cg\lib;..\opennurbs\ReleaseStaticLib;..\lib\glew-1.7.0\lib;..\lib\lpng1637-vs2019\projects\vstudio\Release Library;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
86135
<IgnoreSpecificDefaultLibraries>LIBCMT.lib</IgnoreSpecificDefaultLibraries>
87136
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -91,6 +140,27 @@
91140
<TargetMachine>MachineX86</TargetMachine>
92141
</Link>
93142
</ItemDefinitionGroup>
143+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
144+
<ClCompile>
145+
<AdditionalIncludeDirectories>..\opennurbs;.\render;.\vecmath-c++-1.2-1.4;..\lib\lpng1637-vs2019;..\lib\zlib-1.2.11;..\lib\inc;..\lib\Cg\include;..\lib\glew-2.2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
146+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
147+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
148+
<PrecompiledHeader>
149+
</PrecompiledHeader>
150+
<WarningLevel>Level3</WarningLevel>
151+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
152+
</ClCompile>
153+
<Link>
154+
<AdditionalDependencies>glew32.lib;cg.lib;cgGL.lib;libpng16.lib;zlib.lib;opennurbs_static.lib;glut32.lib;glu32.lib;opengl32.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
155+
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
156+
<AdditionalLibraryDirectories>..\lib\Cg\lib.x64;..\opennurbs\x64\Release;..\lib\glew-2.2.0\lib\Release\x64;..\lib\lpng1637-vs2019\projects\vstudio\x64\Release Library;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
157+
<IgnoreSpecificDefaultLibraries>LIBCMT.lib</IgnoreSpecificDefaultLibraries>
158+
<GenerateDebugInformation>true</GenerateDebugInformation>
159+
<SubSystem>Console</SubSystem>
160+
<OptimizeReferences>true</OptimizeReferences>
161+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
162+
</Link>
163+
</ItemDefinitionGroup>
94164
<ItemGroup>
95165
<ClCompile Include="bspsgpu.cxx" />
96166
<ClCompile Include="BSPSIO.cxx" />

‎run_spray.bat‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
bspsgpu.exe data\spray.3dm
1+
SET PATH=%PATH%;.\x64\Release
2+
.\x64\Release\bspsgpu.exe data\spray.3dm

‎run_surface.bat‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
bspsgpu.exe data\surface.3dm
1+
SET PATH=%PATH%;.\x64\Release
2+
.\x64\Release\bspsgpu.exe data\surface.3dm

0 commit comments

Comments
 (0)