Skip to content

Commit 01d74f1

Browse files
authored
Rename the VS2015 directory to VS2019, since we now build the Windows libraries using VS 2019. (#237)
* Rename the Windows packaged library directory to VS2019 since we now build using Visual Studio 2019. * Add readme note about Windows directory change (and previous Linux directory change) and new minimum VS version.
1 parent e972f19 commit 01d74f1

File tree

3 files changed

+25
-10
lines changed

3 files changed

+25
-10
lines changed

build_scripts/desktop/get_variant.sh

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ arch=
3030
arch_win=
3131
debugmode=Release
3232
msvc_runtime_library=MD
33-
vs=VS2015
33+
vs=VS2019
3434
stl=c++
3535
linux_abi=legacy
3636

37-
for c in $(echo "${filename}" | tr "_.-" "\n\n\n"); do
37+
for c in $(echo "${filename}" | tr "[:upper:]" "[:lower:]" | tr "_.-" "\n\n\n"); do
3838
case $c in
3939
# Operating systems
4040
ios)
@@ -115,15 +115,9 @@ for c in $(echo "${filename}" | tr "_.-" "\n\n\n"); do
115115
release)
116116
debugmode=Release
117117
;;
118-
Release)
119-
debugmode=Release
120-
;;
121118
debug)
122119
debugmode=Debug
123120
;;
124-
Debug)
125-
debugmode=Debug
126-
;;
127121
# Android STL variant
128122
c++)
129123
stl=c++
@@ -143,6 +137,18 @@ for c in $(echo "${filename}" | tr "_.-" "\n\n\n"); do
143137
legacy)
144138
linux_abi=legacy
145139
;;
140+
vs2019)
141+
vs=VS2019
142+
;;
143+
vs2017)
144+
vs=VS2017
145+
;;
146+
vs2015)
147+
vs=VS2015
148+
;;
149+
vs2013)
150+
vs=VS2013
151+
;;
146152
esac
147153
done
148154

release_build_files/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ elseif(MSVC)
4545
else()
4646
set(MSVC_CONFIG Debug)
4747
endif()
48-
set(MSVC_VS_VERSION VS2015)
48+
set(MSVC_VS_VERSION VS2019)
4949
set(FIREBASE_SDK_LIBDIR
5050
${FIREBASE_CPP_SDK_DIR}/libs/windows/${MSVC_VS_VERSION}/${MSVC_RUNTIME_MODE}/${MSVC_CPU}/${MSVC_CONFIG})
5151
else()

release_build_files/readme.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ Firebase Instance ID (stub) | firebase_instance_id.lib
413413
Firebase Cloud Messaging (stub) | firebase_messaging.lib
414414
| firebase_app.lib
415415

416-
The provided libraries have been tested using Visual Studio 2015 and 2017. When
416+
The provided libraries have been tested using Visual Studio 2019. When
417417
building C++ desktop apps on Windows, you will need to link the following
418418
Windows SDK libraries (consult your compiler documentation for more
419419
information):
@@ -562,6 +562,15 @@ code.
562562
### 7.0.0
563563
- Changes
564564
- General (iOS): iOS SDKs are now built using Xcode 11.7.
565+
- General (Desktop): Windows libraries are now built using Visual
566+
Studio 2019. While VS 2019 is binary-compatible with VS 2015 and
567+
VS 2017, you must use VS 2019 or newer to link the desktop SDK.
568+
The libraries have been moved from libs/windows/VS2015 to
569+
libs/windows/VS2019 to reflect this.
570+
- General (Desktop): Linux libraries are now built with both the
571+
C++11 ABI and the legacy ABI. The libraries have been moved
572+
from libs/linux/${arch} to libs/linux/${arch}/legacy and
573+
libs/linux/${arch}/cxx11 to reflect this.
565574
- AdMob (Android): Fix a JNI error when initializing without Firebase App.
566575
- Analytics: Remove deprecated SetMinimumSessionDuration call.
567576
- Installations: Added Installations SDK. See [Documentations](http://firebase.google.com/docs/reference/cpp/namespace/firebase/installations) for

0 commit comments

Comments
 (0)