Skip to content

Commit c333cae

Browse files
committed
Merge branch 'master' into registration
2 parents e635ce8 + e8a5628 commit c333cae

File tree

9 files changed

+2
-331
lines changed

9 files changed

+2
-331
lines changed

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,8 @@ Make sure you install the driver as describe above first.
140140

141141
### Windows / Visual Studio
142142

143-
2. Open the .sln file from ./build/msvc for your version of Visual Studio.
144-
3. Confirm the platform configuration has x64 selected
145-
4. Build and run.
143+
1. Use CMake to generate a solution.
144+
2. Build and run.
146145

147146
### Other platforms
148147

build/msvc/libfreenect2_vs2012.sln

Lines changed: 0 additions & 20 deletions
This file was deleted.

build/msvc/libfreenect2_vs2013.sln

Lines changed: 0 additions & 20 deletions
This file was deleted.

build/msvc/projects/protonect_vs2012.filters

Lines changed: 0 additions & 27 deletions
This file was deleted.

build/msvc/projects/protonect_vs2012.vcxproj

Lines changed: 0 additions & 115 deletions
This file was deleted.

build/msvc/projects/protonect_vs2013.filters

Lines changed: 0 additions & 27 deletions
This file was deleted.

build/msvc/projects/protonect_vs2013.vcxproj

Lines changed: 0 additions & 115 deletions
This file was deleted.

examples/protonect/include/libfreenect2/depth_packet_processor.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ struct LIBFREENECT2_API DepthPacket
4444
size_t buffer_length;
4545
};
4646

47-
// explicit instantiation and export to make vsc++ happy
48-
template class LIBFREENECT2_API PacketProcessor<DepthPacket>;
4947
typedef PacketProcessor<DepthPacket> BaseDepthPacketProcessor;
5048

5149
class LIBFREENECT2_API DepthPacketProcessor : public BaseDepthPacketProcessor

examples/protonect/include/libfreenect2/rgb_packet_processor.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ struct LIBFREENECT2_API RgbPacket
4545
size_t jpeg_buffer_length;
4646
};
4747

48-
// explicit instantiation and export to make vsc++ happy
49-
template class LIBFREENECT2_API PacketProcessor<RgbPacket>;
5048
typedef PacketProcessor<RgbPacket> BaseRgbPacketProcessor;
5149

5250
class LIBFREENECT2_API RgbPacketProcessor : public BaseRgbPacketProcessor

0 commit comments

Comments
 (0)