Skip to content

Commit ad6fa4b

Browse files
author
Cynthia Jiang
committed
revert unnecessary change
1 parent dd2a651 commit ad6fa4b

File tree

4 files changed

+9
-19
lines changed

4 files changed

+9
-19
lines changed

CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,6 @@ if(NOT EXISTS ${FIREBASE_CPP_SDK_DIR})
207207
${FIREBASE_CPP_SDK_DIR}. See the readme.md for more information")
208208
endif()
209209

210-
# if(MSVC AND NOT EXISTS ${MONO_DIR})
211-
# message(FATAL_ERROR "Mono directory doesn't exist: \
212-
# ${MONO_DIR}. See the readme.md for more information")
213-
# endif()
214-
215210
# Add the Firebase libraries to the target using the function from the SDK.
216211
add_subdirectory(${FIREBASE_CPP_SDK_DIR} bin/ EXCLUDE_FROM_ALL)
217212

build_windows_x64.bat

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ IF EXIST ..\firebase-cpp-sdk (
3232
SET CPP_DIR=-DFIREBASE_CPP_SDK_DIR^=../../firebase-cpp-sdk
3333
)
3434

35-
@REM IF EXIST "C:\Program Files\Mono\bin" (
36-
@REM SET MONO_DIR="C:/Program Files/Mono/bin"
37-
@REM ) ELSE (
38-
@REM ECHO ERROR: Cant find mono in program files
39-
@REM EXIT /B -1
40-
@REM )
35+
IF EXIST "C:\Program Files\Mono\bin" (
36+
SET MONO_DIR="C:/Program Files/Mono/bin"
37+
) ELSE (
38+
ECHO ERROR: Cant find mono in program files
39+
EXIT /B -1
40+
)
4141

4242
IF EXIST "C:\Program Files\OpenSSL-Win64" (
4343
SET OPENSSL_x64="C:/Program Files/OpenSSL-Win64"
@@ -53,8 +53,8 @@ if %errorlevel% neq 0 (SET status=%errorlevel%)
5353
:: CALL :BUILD mono, "-DFIREBASE_INCLUDE_MONO=ON"
5454
:: if %errorlevel% neq 0 (SET status=%errorlevel%)
5555

56-
@REM CALL :BUILD unity_separate, "-DFIREBASE_INCLUDE_UNITY=ON -DFIREBASE_UNI_LIBRARY=OFF"
57-
@REM if %errorlevel% neq 0 (SET status=%errorlevel%)
56+
CALL :BUILD unity_separate, "-DFIREBASE_INCLUDE_UNITY=ON -DFIREBASE_UNI_LIBRARY=OFF"
57+
if %errorlevel% neq 0 (SET status=%errorlevel%)
5858

5959
:: TODO: Fix mono build to not need unity deps
6060
:: CALL :BUILD mono_separate, "-DFIREBASE_INCLUDE_MONO=ON -DFIREBASE_UNI_LIBRARY=OFF"

cmake/firebase_swig.cmake

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,9 @@
1616

1717
include(FindSWIG)
1818

19-
message(WARNING "=================")
20-
message(WARNING "${SWIG_DIR}")
21-
2219
# 3.0.6 has support for -outfile command line option, min version request 3.0.6
2320
find_package(SWIG 3.0.6)
2421

25-
message(WARNING "${SWIG_DIR}")
26-
2722
include(${SWIG_USE_FILE})
2823

2924
set(FIREBASE_SWIG_FIX_PY ${CMAKE_CURRENT_LIST_DIR}/swig_fix.py)

scripts/gha/unity_installer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def install_unity(unity_version, platforms):
171171
"--verbose", unity_version,
172172
"-p", package_csv])
173173
# This will list what u3d has installed. For debugging purposes.
174-
#run([u3d, "list"])
174+
# run([u3d, "list"]) TODO sort out the crash issue.
175175
logging.info("Finished installing Unity.")
176176

177177

0 commit comments

Comments
 (0)