diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b1d7b71..3d7587c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -147,11 +147,11 @@ jobs:
./configure --prefix=/usr
shell: msys2 {0}
- uses: microsoft/setup-msbuild@v1
- - run: msbuild -m -p:Platform=${{ matrix.platform }} -p:Configuration=${{ env.CONFIGURATION }} msvc/libdivecomputer.vcxproj
+ - run: msbuild -m -p:Platform=${{ matrix.platform }} -p:Configuration=${{ env.CONFIGURATION }} contrib/msvc/libdivecomputer.vcxproj
- uses: actions/upload-artifact@v3
with:
name: ${{ github.job }}-${{ matrix.platform }}
- path: msvc/${{ matrix.platform }}/${{ env.CONFIGURATION }}/bin
+ path: contrib/msvc/${{ matrix.platform }}/${{ env.CONFIGURATION }}/bin
android:
diff --git a/Makefile.am b/Makefile.am
index 617a105..f60d2af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,5 +17,5 @@ pkgconfig_DATA = libdivecomputer.pc
EXTRA_DIST = \
libdivecomputer.pc.in \
contrib/android/Android.mk \
- msvc/libdivecomputer.vcxproj \
- msvc/libdivecomputer.vcxproj.filters
+ contrib/msvc/libdivecomputer.vcxproj \
+ contrib/msvc/libdivecomputer.vcxproj.filters
diff --git a/contrib/msvc/libdivecomputer.vcxproj b/contrib/msvc/libdivecomputer.vcxproj
new file mode 100644
index 0000000..dbdb1e1
--- /dev/null
+++ b/contrib/msvc/libdivecomputer.vcxproj
@@ -0,0 +1,388 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {CEA7215A-D6B5-4840-8086-3C854F371997}
+ libdivecomputer
+ Win32Proj
+
+
+
+ DynamicLibrary
+ true
+ $(DefaultPlatformToolset)
+ Unicode
+
+
+ DynamicLibrary
+ true
+ $(DefaultPlatformToolset)
+ Unicode
+
+
+ DynamicLibrary
+ false
+ $(DefaultPlatformToolset)
+ Unicode
+ true
+
+
+ DynamicLibrary
+ false
+ $(DefaultPlatformToolset)
+ Unicode
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ $(SolutionDir)$(PlatformTarget)\$(Configuration)\bin\
+ $(PlatformTarget)\$(Configuration)\obj\
+
+
+ true
+ $(SolutionDir)$(PlatformTarget)\$(Configuration)\bin\
+ $(PlatformTarget)\$(Configuration)\obj\
+
+
+ false
+ $(SolutionDir)$(PlatformTarget)\$(Configuration)\bin\
+ $(PlatformTarget)\$(Configuration)\obj\
+
+
+ false
+ $(SolutionDir)$(PlatformTarget)\$(Configuration)\bin\
+ $(PlatformTarget)\$(Configuration)\obj\
+
+
+
+ Disabled
+ ..\..\include;%(AdditionalIncludeDirectories)
+ _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBDIVECOMPUTER_EXPORTS;ENABLE_LOGGING;HAVE_AF_IRDA_H;HAVE_WS2BTH_H;%(PreprocessorDefinitions)
+
+ Level3
+ true
+
+
+ ws2_32.lib;%(AdditionalDependencies)
+ $(OutDir)libdivecomputer.def
+ true
+ Windows
+
+
+
+
+ Disabled
+ ..\..\include;%(AdditionalIncludeDirectories)
+ _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBDIVECOMPUTER_EXPORTS;ENABLE_LOGGING;HAVE_AF_IRDA_H;HAVE_WS2BTH_H;%(PreprocessorDefinitions)
+
+
+ Level3
+ true
+
+
+ ws2_32.lib;%(AdditionalDependencies)
+ $(OutDir)libdivecomputer.def
+ true
+ Windows
+
+
+
+
+ MaxSpeed
+ true
+ ..\..\include;%(AdditionalIncludeDirectories)
+ _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBDIVECOMPUTER_EXPORTS;ENABLE_LOGGING;HAVE_AF_IRDA_H;HAVE_WS2BTH_H;%(PreprocessorDefinitions)
+ true
+
+ Level3
+ true
+
+
+ ws2_32.lib;%(AdditionalDependencies)
+ $(OutDir)libdivecomputer.def
+ true
+ Windows
+ true
+ true
+
+
+
+
+ MaxSpeed
+ true
+ ..\..\include;%(AdditionalIncludeDirectories)
+ _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBDIVECOMPUTER_EXPORTS;ENABLE_LOGGING;HAVE_AF_IRDA_H;HAVE_WS2BTH_H;%(PreprocessorDefinitions)
+ true
+
+
+ Level3
+ true
+
+
+ ws2_32.lib;%(AdditionalDependencies)
+ $(OutDir)libdivecomputer.def
+ true
+ Windows
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ echo EXPORTS > "$(OutDir)libdivecomputer.def" && type "%(FullPath)" >> "$(OutDir)libdivecomputer.def"
+ echo EXPORTS > "$(OutDir)libdivecomputer.def" && type "%(FullPath)" >> "$(OutDir)libdivecomputer.def"
+ $(OutDir)libdivecomputer.def;%(Outputs)
+ $(OutDir)libdivecomputer.def;%(Outputs)
+ echo EXPORTS > "$(OutDir)libdivecomputer.def" && type "%(FullPath)" >> "$(OutDir)libdivecomputer.def"
+ echo EXPORTS > "$(OutDir)libdivecomputer.def" && type "%(FullPath)" >> "$(OutDir)libdivecomputer.def"
+ $(OutDir)libdivecomputer.def;%(Outputs)
+ $(OutDir)libdivecomputer.def;%(Outputs)
+
+
+
+
+
+
diff --git a/msvc/libdivecomputer.vcxproj.filters b/contrib/msvc/libdivecomputer.vcxproj.filters
similarity index 100%
rename from msvc/libdivecomputer.vcxproj.filters
rename to contrib/msvc/libdivecomputer.vcxproj.filters
diff --git a/msvc/libdivecomputer.vcxproj b/msvc/libdivecomputer.vcxproj
deleted file mode 100644
index b3b370f..0000000
--- a/msvc/libdivecomputer.vcxproj
+++ /dev/null
@@ -1,388 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {CEA7215A-D6B5-4840-8086-3C854F371997}
- libdivecomputer
- Win32Proj
-
-
-
- DynamicLibrary
- true
- $(DefaultPlatformToolset)
- Unicode
-
-
- DynamicLibrary
- true
- $(DefaultPlatformToolset)
- Unicode
-
-
- DynamicLibrary
- false
- $(DefaultPlatformToolset)
- Unicode
- true
-
-
- DynamicLibrary
- false
- $(DefaultPlatformToolset)
- Unicode
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
- $(SolutionDir)$(PlatformTarget)\$(Configuration)\bin\
- $(PlatformTarget)\$(Configuration)\obj\
-
-
- true
- $(SolutionDir)$(PlatformTarget)\$(Configuration)\bin\
- $(PlatformTarget)\$(Configuration)\obj\
-
-
- false
- $(SolutionDir)$(PlatformTarget)\$(Configuration)\bin\
- $(PlatformTarget)\$(Configuration)\obj\
-
-
- false
- $(SolutionDir)$(PlatformTarget)\$(Configuration)\bin\
- $(PlatformTarget)\$(Configuration)\obj\
-
-
-
- Disabled
- ..\include;%(AdditionalIncludeDirectories)
- _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBDIVECOMPUTER_EXPORTS;ENABLE_LOGGING;HAVE_AF_IRDA_H;HAVE_WS2BTH_H;%(PreprocessorDefinitions)
-
- Level3
- true
-
-
- ws2_32.lib;%(AdditionalDependencies)
- $(OutDir)libdivecomputer.def
- true
- Windows
-
-
-
-
- Disabled
- ..\include;%(AdditionalIncludeDirectories)
- _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBDIVECOMPUTER_EXPORTS;ENABLE_LOGGING;HAVE_AF_IRDA_H;HAVE_WS2BTH_H;%(PreprocessorDefinitions)
-
-
- Level3
- true
-
-
- ws2_32.lib;%(AdditionalDependencies)
- $(OutDir)libdivecomputer.def
- true
- Windows
-
-
-
-
- MaxSpeed
- true
- ..\include;%(AdditionalIncludeDirectories)
- _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBDIVECOMPUTER_EXPORTS;ENABLE_LOGGING;HAVE_AF_IRDA_H;HAVE_WS2BTH_H;%(PreprocessorDefinitions)
- true
-
- Level3
- true
-
-
- ws2_32.lib;%(AdditionalDependencies)
- $(OutDir)libdivecomputer.def
- true
- Windows
- true
- true
-
-
-
-
- MaxSpeed
- true
- ..\include;%(AdditionalIncludeDirectories)
- _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBDIVECOMPUTER_EXPORTS;ENABLE_LOGGING;HAVE_AF_IRDA_H;HAVE_WS2BTH_H;%(PreprocessorDefinitions)
- true
-
-
- Level3
- true
-
-
- ws2_32.lib;%(AdditionalDependencies)
- $(OutDir)libdivecomputer.def
- true
- Windows
- true
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- echo EXPORTS > "$(OutDir)libdivecomputer.def" && type "%(FullPath)" >> "$(OutDir)libdivecomputer.def"
- echo EXPORTS > "$(OutDir)libdivecomputer.def" && type "%(FullPath)" >> "$(OutDir)libdivecomputer.def"
- $(OutDir)libdivecomputer.def;%(Outputs)
- $(OutDir)libdivecomputer.def;%(Outputs)
- echo EXPORTS > "$(OutDir)libdivecomputer.def" && type "%(FullPath)" >> "$(OutDir)libdivecomputer.def"
- echo EXPORTS > "$(OutDir)libdivecomputer.def" && type "%(FullPath)" >> "$(OutDir)libdivecomputer.def"
- $(OutDir)libdivecomputer.def;%(Outputs)
- $(OutDir)libdivecomputer.def;%(Outputs)
-
-
-
-
-
-