Skip to content

Commit e77da96

Browse files
fluffyfreakWebster Sheets
authored and
Webster Sheets
committed
Update VS2019 for nanosockets and head tracking
1 parent 1014b95 commit e77da96

File tree

2 files changed

+23
-4
lines changed

2 files changed

+23
-4
lines changed

win32/vs2019/pioneer.vcxproj

+8-4
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
</ClCompile>
109109
<Link>
110110
<SubSystem>Windows</SubSystem>
111-
<AdditionalDependencies>fmt.lib;Psapi.lib;glew.lib;profiler.lib;assimp-vc142-mt.lib;shlwapi.lib;ogg.lib;vorbis.lib;vorbisfile.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype.lib;sigc-vc140-2_0.lib;collider.lib;galaxy.lib;graphics.lib;jenkins.lib;lua.lib;terrain.lib;text.lib;scenegraph.lib;%(AdditionalDependencies)</AdditionalDependencies>
111+
<AdditionalDependencies>fmt.lib;Psapi.lib;glew.lib;profiler.lib;assimp-vc142-mt.lib;shlwapi.lib;ogg.lib;vorbis.lib;vorbisfile.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype.lib;sigc-vc140-2_0.lib;collider.lib;galaxy.lib;graphics.lib;jenkins.lib;lua.lib;terrain.lib;text.lib;scenegraph.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
112112
<AdditionalLibraryDirectories>../../win32/lib;../../../pioneer-thirdparty/win32/lib/x64/vs2019;$(SolutionDir)\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
113113
<IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
114114
<LargeAddressAware>true</LargeAddressAware>
@@ -122,7 +122,7 @@
122122
<ClCompile />
123123
<Link>
124124
<SubSystem>Windows</SubSystem>
125-
<AdditionalDependencies>fmt.lib;Psapi.lib;glew.lib;profiler.lib;assimp-vc142-mt.lib;shlwapi.lib;ogg.lib;vorbis.lib;vorbisfile.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype.lib;sigc-vc140-2_0.lib;collider.lib;galaxy.lib;graphics.lib;jenkins.lib;lua.lib;terrain.lib;text.lib;scenegraph.lib;%(AdditionalDependencies)</AdditionalDependencies>
125+
<AdditionalDependencies>fmt.lib;Psapi.lib;glew.lib;profiler.lib;assimp-vc142-mt.lib;shlwapi.lib;ogg.lib;vorbis.lib;vorbisfile.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype.lib;sigc-vc140-2_0.lib;collider.lib;galaxy.lib;graphics.lib;jenkins.lib;lua.lib;terrain.lib;text.lib;scenegraph.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
126126
<AdditionalLibraryDirectories>../../win32/lib;../../../pioneer-thirdparty/win32/lib/x64/vs2019;$(SolutionDir)\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
127127
<IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
128128
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
@@ -145,7 +145,7 @@
145145
<ClCompile />
146146
<Link>
147147
<SubSystem>Windows</SubSystem>
148-
<AdditionalDependencies>fmt.lib;Psapi.lib;glew.lib;profiler.lib;assimp-vc142-mt.lib;lua.lib;jenkins.lib;shlwapi.lib;ogg.lib;vorbis.lib;vorbisfile.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype.lib;sigc-vc140-2_0.lib;text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;scenegraph.lib;%(AdditionalDependencies)</AdditionalDependencies>
148+
<AdditionalDependencies>fmt.lib;Psapi.lib;glew.lib;profiler.lib;assimp-vc142-mt.lib;lua.lib;jenkins.lib;shlwapi.lib;ogg.lib;vorbis.lib;vorbisfile.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype.lib;sigc-vc140-2_0.lib;text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;scenegraph.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
149149
<AdditionalLibraryDirectories>../../win32/lib;../../../pioneer-thirdparty/win32/lib/x64/vs2019;$(SolutionDir)\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
150150
<LargeAddressAware>true</LargeAddressAware>
151151
</Link>
@@ -171,7 +171,7 @@
171171
<ClCompile />
172172
<Link>
173173
<SubSystem>Windows</SubSystem>
174-
<AdditionalDependencies>fmt.lib;Psapi.lib;glew.lib;profiler.lib;assimp-vc142-mt.lib;lua.lib;jenkins.lib;shlwapi.lib;ogg.lib;vorbis.lib;vorbisfile.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype.lib;sigc-vc140-2_0.lib;text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;scenegraph.lib;%(AdditionalDependencies)</AdditionalDependencies>
174+
<AdditionalDependencies>fmt.lib;Psapi.lib;glew.lib;profiler.lib;assimp-vc142-mt.lib;lua.lib;jenkins.lib;shlwapi.lib;ogg.lib;vorbis.lib;vorbisfile.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype.lib;sigc-vc140-2_0.lib;text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;scenegraph.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
175175
<AdditionalLibraryDirectories>../../win32/lib;../../../pioneer-thirdparty/win32/lib/x64/vs2019;$(SolutionDir)\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
176176
<LargeAddressAware>true</LargeAddressAware>
177177
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
@@ -205,6 +205,7 @@
205205
<ClCompile Include="..\..\contrib\lz4\lz4frame.c" />
206206
<ClCompile Include="..\..\contrib\lz4\lz4hc.c" />
207207
<ClCompile Include="..\..\contrib\lz4\xxhash.c" />
208+
<ClCompile Include="..\..\contrib\nanosockets\nanosockets.c" />
208209
<ClCompile Include="..\..\contrib\PicoDDS\PicoDDS.cpp" />
209210
<ClCompile Include="..\..\src\Background.cpp" />
210211
<ClCompile Include="..\..\src\BaseSphere.cpp" />
@@ -380,6 +381,7 @@
380381
<ClCompile Include="..\..\src\ShipCockpit.cpp" />
381382
<ClCompile Include="..\..\src\ShipType.cpp" />
382383
<ClCompile Include="..\..\src\ship\CameraController.cpp" />
384+
<ClCompile Include="..\..\src\ship\Headtracker.cpp" />
383385
<ClCompile Include="..\..\src\ship\PlayerShipController.cpp" />
384386
<ClCompile Include="..\..\src\ship\PrecalcPath.cpp" />
385387
<ClCompile Include="..\..\src\ship\Propulsion.cpp" />
@@ -424,6 +426,7 @@
424426
<ClInclude Include="..\..\contrib\lz4\lz4frame.h" />
425427
<ClInclude Include="..\..\contrib\lz4\lz4hc.h" />
426428
<ClInclude Include="..\..\contrib\lz4\xxhash.h" />
429+
<ClInclude Include="..\..\contrib\nanosockets\nanosockets.h" />
427430
<ClInclude Include="..\..\contrib\nanosvg\nanosvg.h" />
428431
<ClInclude Include="..\..\contrib\nanosvg\nanosvgrast.h" />
429432
<ClInclude Include="..\..\contrib\PicoDDS\PicoDDS.h" />
@@ -573,6 +576,7 @@
573576
<ClInclude Include="..\..\src\ShipCockpit.h" />
574577
<ClInclude Include="..\..\src\ShipType.h" />
575578
<ClInclude Include="..\..\src\ship\CameraController.h" />
579+
<ClInclude Include="..\..\src\ship\Headtracker.h" />
576580
<ClInclude Include="..\..\src\ship\PlayerShipController.h" />
577581
<ClInclude Include="..\..\src\ship\PrecalcPath.h" />
578582
<ClInclude Include="..\..\src\ship\Propulsion.h" />

win32/vs2019/pioneer.vcxproj.filters

+15
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
<Filter Include="src\core">
4141
<UniqueIdentifier>{077edfac-2118-4205-94da-792445afd8da}</UniqueIdentifier>
4242
</Filter>
43+
<Filter Include="src\nanosockets">
44+
<UniqueIdentifier>{1b3c4a96-acf0-43c9-a71f-5ca25dec7883}</UniqueIdentifier>
45+
</Filter>
4346
</ItemGroup>
4447
<ItemGroup>
4548
<ClCompile Include="..\..\src\Body.cpp">
@@ -600,6 +603,12 @@
600603
<ClCompile Include="..\..\src\lua\LuaPropertyMap.cpp">
601604
<Filter>src\Lua</Filter>
602605
</ClCompile>
606+
<ClCompile Include="..\..\contrib\nanosockets\nanosockets.c">
607+
<Filter>src\nanosockets</Filter>
608+
</ClCompile>
609+
<ClCompile Include="..\..\src\ship\Headtracker.cpp">
610+
<Filter>src\ship</Filter>
611+
</ClCompile>
603612
</ItemGroup>
604613
<ItemGroup>
605614
<ClInclude Include="..\..\src\Aabb.h">
@@ -1190,6 +1199,12 @@
11901199
<ClInclude Include="..\..\src\lua\LuaPropertyMap.h">
11911200
<Filter>src\Lua</Filter>
11921201
</ClInclude>
1202+
<ClInclude Include="..\..\contrib\nanosockets\nanosockets.h">
1203+
<Filter>src\nanosockets</Filter>
1204+
</ClInclude>
1205+
<ClInclude Include="..\..\src\ship\Headtracker.h">
1206+
<Filter>src\ship</Filter>
1207+
</ClInclude>
11931208
</ItemGroup>
11941209
<ItemGroup>
11951210
<ResourceCompile Include="..\..\src\win32\pioneer.rc">

0 commit comments

Comments
 (0)