Skip to content

Commit 2a32b95

Browse files
jenzyjenzy
committed
update VS project, update libs, fix compile
1 parent 83223a6 commit 2a32b95

36 files changed

+8993
-1338
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,3 +155,4 @@ $RECYCLE.BIN/
155155
# Mac desktop service store files
156156
.DS_Store
157157
/NBody OpenCL/ce4c0pv3.du0
158+
.vs/

‎N-Body.sln

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.21005.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.28307.106
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "N-Body", "NBody OpenCL\NBody OpenCL.vcxproj", "{4822E7DA-3EB0-4EAE-A649-C8B3AC77CF22}"
77
EndProject
@@ -15,16 +15,17 @@ Global
1515
Release|x64 = Release|x64
1616
EndGlobalSection
1717
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18-
{4822E7DA-3EB0-4EAE-A649-C8B3AC77CF22}.Debug|Win32.ActiveCfg = Debug|Win32
19-
{4822E7DA-3EB0-4EAE-A649-C8B3AC77CF22}.Debug|Win32.Build.0 = Debug|Win32
18+
{4822E7DA-3EB0-4EAE-A649-C8B3AC77CF22}.Debug|Win32.ActiveCfg = Debug|x64
2019
{4822E7DA-3EB0-4EAE-A649-C8B3AC77CF22}.Debug|x64.ActiveCfg = Debug|x64
2120
{4822E7DA-3EB0-4EAE-A649-C8B3AC77CF22}.Debug|x64.Build.0 = Debug|x64
22-
{4822E7DA-3EB0-4EAE-A649-C8B3AC77CF22}.Release|Win32.ActiveCfg = Release|Win32
23-
{4822E7DA-3EB0-4EAE-A649-C8B3AC77CF22}.Release|Win32.Build.0 = Release|Win32
21+
{4822E7DA-3EB0-4EAE-A649-C8B3AC77CF22}.Release|Win32.ActiveCfg = Release|x64
2422
{4822E7DA-3EB0-4EAE-A649-C8B3AC77CF22}.Release|x64.ActiveCfg = Release|x64
2523
{4822E7DA-3EB0-4EAE-A649-C8B3AC77CF22}.Release|x64.Build.0 = Release|x64
2624
EndGlobalSection
2725
GlobalSection(SolutionProperties) = preSolution
2826
HideSolutionNode = FALSE
2927
EndGlobalSection
28+
GlobalSection(ExtensibilityGlobals) = postSolution
29+
SolutionGuid = {87414527-3539-4CB3-AB76-C6897873F88E}
30+
EndGlobalSection
3031
EndGlobal

‎NBody OpenCL/NBody OpenCL.vcxproj

Lines changed: 10 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|Win32">
5-
<Configuration>Debug</Configuration>
6-
<Platform>Win32</Platform>
7-
</ProjectConfiguration>
84
<ProjectConfiguration Include="Debug|x64">
95
<Configuration>Debug</Configuration>
106
<Platform>x64</Platform>
117
</ProjectConfiguration>
12-
<ProjectConfiguration Include="Release|Win32">
13-
<Configuration>Release</Configuration>
14-
<Platform>Win32</Platform>
15-
</ProjectConfiguration>
168
<ProjectConfiguration Include="Release|x64">
179
<Configuration>Release</Configuration>
1810
<Platform>x64</Platform>
@@ -23,76 +15,38 @@
2315
<Keyword>Win32Proj</Keyword>
2416
<RootNamespace>NBodyOpenCL</RootNamespace>
2517
<ProjectName>N-Body</ProjectName>
18+
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
2619
</PropertyGroup>
2720
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
28-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
29-
<ConfigurationType>Application</ConfigurationType>
30-
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v120</PlatformToolset>
32-
<CharacterSet>Unicode</CharacterSet>
33-
</PropertyGroup>
3421
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3522
<ConfigurationType>Application</ConfigurationType>
3623
<UseDebugLibraries>true</UseDebugLibraries>
37-
<PlatformToolset>v120</PlatformToolset>
38-
<CharacterSet>Unicode</CharacterSet>
39-
</PropertyGroup>
40-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
41-
<ConfigurationType>Application</ConfigurationType>
42-
<UseDebugLibraries>false</UseDebugLibraries>
43-
<PlatformToolset>v120</PlatformToolset>
44-
<WholeProgramOptimization>true</WholeProgramOptimization>
24+
<PlatformToolset>v141</PlatformToolset>
4525
<CharacterSet>Unicode</CharacterSet>
4626
</PropertyGroup>
4727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4828
<ConfigurationType>Application</ConfigurationType>
4929
<UseDebugLibraries>false</UseDebugLibraries>
50-
<PlatformToolset>v120</PlatformToolset>
30+
<PlatformToolset>v141</PlatformToolset>
5131
<WholeProgramOptimization>true</WholeProgramOptimization>
5232
<CharacterSet>Unicode</CharacterSet>
5333
</PropertyGroup>
5434
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5535
<ImportGroup Label="ExtensionSettings">
5636
</ImportGroup>
57-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
58-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
59-
</ImportGroup>
6037
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
6138
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6239
</ImportGroup>
63-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
64-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
65-
</ImportGroup>
6640
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
6741
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6842
</ImportGroup>
6943
<PropertyGroup Label="UserMacros" />
70-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
71-
<LinkIncremental>true</LinkIncremental>
72-
</PropertyGroup>
7344
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7445
<LinkIncremental>true</LinkIncremental>
7546
</PropertyGroup>
76-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
77-
<LinkIncremental>false</LinkIncremental>
78-
</PropertyGroup>
7947
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8048
<LinkIncremental>false</LinkIncremental>
8149
</PropertyGroup>
82-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
83-
<ClCompile>
84-
<PrecompiledHeader>
85-
</PrecompiledHeader>
86-
<WarningLevel>Level3</WarningLevel>
87-
<Optimization>Disabled</Optimization>
88-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
89-
<SDLCheck>true</SDLCheck>
90-
</ClCompile>
91-
<Link>
92-
<SubSystem>Console</SubSystem>
93-
<GenerateDebugInformation>true</GenerateDebugInformation>
94-
</Link>
95-
</ItemDefinitionGroup>
9650
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
9751
<ClCompile>
9852
<PrecompiledHeader>
@@ -101,18 +55,18 @@
10155
<Optimization>Disabled</Optimization>
10256
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
10357
<SDLCheck>true</SDLCheck>
104-
<AdditionalIncludeDirectories>$(ProjectDir)\libs\glew-1.11.0\include;C:\Program Files (x86)\AMD APP SDK\2.9\include;$(ProjectDir)\libs\freeglut\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
58+
<AdditionalIncludeDirectories>$(ProjectDir)\libs\glew-2.1.0\include;C:\Program Files (x86)\AMD APP SDK\2.9\include;$(ProjectDir)\libs\freeglut\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
10559
<OpenMPSupport>true</OpenMPSupport>
10660
</ClCompile>
10761
<Link>
10862
<SubSystem>Console</SubSystem>
10963
<GenerateDebugInformation>true</GenerateDebugInformation>
110-
<AdditionalLibraryDirectories>$(ProjectDir)\libs\glew-1.11.0\lib\Release\x64;C:\Program Files (x86)\AMD APP SDK\2.9\lib\x86_64;$(ProjectDir)\libs\freeglut\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
64+
<AdditionalLibraryDirectories>$(ProjectDir)\libs\glew-2.1.0\lib\Release\x64;C:\Program Files (x86)\AMD APP SDK\2.9\lib\x86_64;$(ProjectDir)\libs\freeglut\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
11165
<AdditionalDependencies>opencl.lib;amd64/msmpi.lib;freeglut.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
11266
</Link>
11367
<PostBuildEvent>
11468
<Command>copy "$(ProjectDir)\libs\freeglut\bin\x64\freeglut.dll" "$(TargetDir)"
115-
copy "$(ProjectDir)\libs\glew-1.11.0\bin\Release\x64\glew32.dll" "$(TargetDir)"</Command>
69+
copy "$(ProjectDir)\libs\glew-2.1.0\bin\Release\x64\glew32.dll" "$(TargetDir)"</Command>
11670
</PostBuildEvent>
11771
<PreBuildEvent>
11872
<Command>copy "$(ProjectDir)\res\kernelVec.cl" "$(TargetDir)\res"
@@ -121,24 +75,6 @@ copy "$(ProjectDir)\res\shader.fragment.glsl" "$(TargetDir)\res"
12175
</Command>
12276
</PreBuildEvent>
12377
</ItemDefinitionGroup>
124-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
125-
<ClCompile>
126-
<WarningLevel>Level3</WarningLevel>
127-
<PrecompiledHeader>
128-
</PrecompiledHeader>
129-
<Optimization>MaxSpeed</Optimization>
130-
<FunctionLevelLinking>true</FunctionLevelLinking>
131-
<IntrinsicFunctions>true</IntrinsicFunctions>
132-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133-
<SDLCheck>true</SDLCheck>
134-
</ClCompile>
135-
<Link>
136-
<SubSystem>Console</SubSystem>
137-
<GenerateDebugInformation>true</GenerateDebugInformation>
138-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
139-
<OptimizeReferences>true</OptimizeReferences>
140-
</Link>
141-
</ItemDefinitionGroup>
14278
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
14379
<ClCompile>
14480
<WarningLevel>Level3</WarningLevel>
@@ -149,20 +85,20 @@ copy "$(ProjectDir)\res\shader.fragment.glsl" "$(TargetDir)\res"
14985
<IntrinsicFunctions>true</IntrinsicFunctions>
15086
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
15187
<SDLCheck>true</SDLCheck>
152-
<AdditionalIncludeDirectories>$(ProjectDir)\libs\glew-1.11.0\include;C:\Program Files (x86)\AMD APP SDK\2.9\include;$(ProjectDir)\libs\freeglut\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
88+
<AdditionalIncludeDirectories>$(ProjectDir)\libs\glew-2.1.0\include;C:\Program Files (x86)\AMD APP SDK\2.9\include;$(ProjectDir)\libs\freeglut\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
15389
<OpenMPSupport>true</OpenMPSupport>
15490
</ClCompile>
15591
<Link>
15692
<SubSystem>Console</SubSystem>
15793
<GenerateDebugInformation>true</GenerateDebugInformation>
15894
<EnableCOMDATFolding>true</EnableCOMDATFolding>
15995
<OptimizeReferences>true</OptimizeReferences>
160-
<AdditionalLibraryDirectories>$(ProjectDir)\libs\glew-1.11.0\lib\Release\x64;C:\Program Files (x86)\AMD APP SDK\2.9\lib\x86_64;$(ProjectDir)\libs\freeglut\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
96+
<AdditionalLibraryDirectories>$(ProjectDir)\libs\glew-2.1.0\lib\Release\x64;C:\Program Files (x86)\AMD APP SDK\2.9\lib\x86_64;$(ProjectDir)\libs\freeglut\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
16197
<AdditionalDependencies>opencl.lib;freeglut.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
16298
</Link>
16399
<PostBuildEvent>
164100
<Command>copy "$(ProjectDir)\libs\freeglut\bin\x64\freeglut.dll" "$(TargetDir)"
165-
copy "$(ProjectDir)\libs\glew-1.11.0\bin\Release\x64\glew32.dll" "$(TargetDir)"</Command>
101+
copy "$(ProjectDir)\libs\glew-2.1.0\bin\Release\x64\glew32.dll" "$(TargetDir)"</Command>
166102
</PostBuildEvent>
167103
<PreBuildEvent>
168104
<Command>copy "$(ProjectDir)\res\kernelVec.cl" "$(TargetDir)\res"

‎NBody OpenCL/libs/freeglut/Readme.txt

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
freeglut 2.8.1-1.mp for MSVC
1+
freeglut 3.0.0-1.mp for MSVC
22

33
This package contains freeglut import libraries, headers, and Windows DLLs.
44
These allow 32 and 64 bit GLUT applications to be compiled on Windows using
@@ -81,21 +81,26 @@ If you still can
8181
then please get in touch via http://www.transmissionzero.co.uk/contact/,
8282
providing as much detail as you can. Please don�t complain to the freeglut guys
8383
unless you�re sure it�s a freeglut bug, and have reproduced the issue after
84-
compiling freeglut from the latest SVN version�if that�s still the case, I�m sure
85-
they would appreciate a bug report or a patch.
84+
compiling freeglut from the latest SVN version�if that�s still the case, I�m
85+
sure they would appreciate a bug report or a patch.
8686

8787

8888
Changelog
8989

90-
2013�05�11: Release 2.8.1-1.mp
90+
2015�07�22: Release 3.0.0-2.mp
9191

92-
� First 2.8.1 MSVC release. I�ve built the package using Visual Studio 2012,
92+
� Modified the freeglut_std.h file so that it doesn�t try to link against the
93+
freeglutd.lib import library.
94+
95+
2015�03�15: Release 3.0.0-1.mp
96+
97+
� First 3.0.0 MSVC release. I�ve built the package using Visual Studio 2013,
9398
and the only change I�ve made is to the DLL version resource�I�ve changed
9499
the description so that my MinGW and MSVC builds are distinguishable from
95100
each other (and other builds) using Windows Explorer.
96101

97102

98-
Martin Payne
99-
2013�05�11
103+
Transmission Zero
104+
2015�07�22
100105

101106
http://www.transmissionzero.co.uk/

0 commit comments

Comments
 (0)