Skip to content

Commit c9de5bd

Browse files
dkim-coderdkim-coder
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # .idea/misc.xml # app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/7segment.dir/7segment.c.o # app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/lcd.dir/lcd.c.o # app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build_targets.stdout.txt
2 parents 3653c08 + 391ebbb commit c9de5bd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1058
-1055
lines changed

‎.idea/modules.xml

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/.cxx/cmake/debug/armeabi-v7a/.ninja_deps

-14.2 KB
Binary file not shown.

‎app/.cxx/cmake/debug/armeabi-v7a/CMakeCache.txt

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This is the CMakeCache file.
2-
# For build in directory: c:/Users/jeus5771/AndroidStudioProjects/FlappyCow-master/app/.cxx/cmake/debug/armeabi-v7a
3-
# It was generated by CMake: C:/Users/jeus5771/AppData/Local/Android/Sdk/cmake/3.10.2.4988404/bin/cmake.exe
2+
# For build in directory: c:/Users/start/Downloads/FlappyCow-TeamProject/app/.cxx/cmake/debug/armeabi-v7a
3+
# It was generated by CMake: C:/Users/start/AppData/Local/Android/Sdk/cmake/3.10.2.4988404/bin/cmake.exe
44
# You can edit this file to change values found and used by cmake.
55
# If you do not want to change any of the values, simply exit the editor.
66
# If you do want to change a value, simply edit, save, and exit the editor.
@@ -15,13 +15,13 @@
1515
########################
1616

1717
//Dependencies for the target
18-
7segment_LIB_DEPENDS:STATIC=general;lcd;general;buzzer;general;led;general;dotmatrix;general;C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/lib/arm-linux-androideabi/16/liblog.so;
18+
7segment_LIB_DEPENDS:STATIC=general;lcd;general;buzzer;general;led;general;dotmatrix;general;buttons;general;C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/lib/arm-linux-androideabi/16/liblog.so;
1919

2020
//No help, variable specified on the command line.
2121
ANDROID_ABI:UNINITIALIZED=armeabi-v7a
2222

2323
//No help, variable specified on the command line.
24-
ANDROID_NDK:UNINITIALIZED=C:\Users\jeus5771\AppData\Local\Android\Sdk\ndk\android-ndk-r21e
24+
ANDROID_NDK:UNINITIALIZED=C:\Users\start\AppData\Local\Android\Sdk\ndk\20.0.5594570
2525

2626
//No help, variable specified on the command line.
2727
ANDROID_PLATFORM:UNINITIALIZED=android-16
@@ -30,10 +30,10 @@ ANDROID_PLATFORM:UNINITIALIZED=android-16
3030
CMAKE_ANDROID_ARCH_ABI:UNINITIALIZED=armeabi-v7a
3131

3232
//No help, variable specified on the command line.
33-
CMAKE_ANDROID_NDK:UNINITIALIZED=C:\Users\jeus5771\AppData\Local\Android\Sdk\ndk\android-ndk-r21e
33+
CMAKE_ANDROID_NDK:UNINITIALIZED=C:\Users\start\AppData\Local\Android\Sdk\ndk\20.0.5594570
3434

3535
//Archiver
36-
CMAKE_AR:FILEPATH=C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-ar.exe
36+
CMAKE_AR:FILEPATH=C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-ar.exe
3737

3838
//Flags used by the compiler during all build types.
3939
CMAKE_ASM_FLAGS:STRING=
@@ -120,13 +120,13 @@ CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON
120120
CMAKE_INSTALL_PREFIX:PATH=C:/Program Files (x86)/Project
121121

122122
//No help, variable specified on the command line.
123-
CMAKE_LIBRARY_OUTPUT_DIRECTORY:UNINITIALIZED=C:\Users\jeus5771\AndroidStudioProjects\FlappyCow-master\app\build\intermediates\cmake\debug\obj\armeabi-v7a
123+
CMAKE_LIBRARY_OUTPUT_DIRECTORY:UNINITIALIZED=C:\Users\start\Downloads\FlappyCow-TeamProject\app\build\intermediates\cmake\debug\obj\armeabi-v7a
124124

125125
//Path to a program.
126-
CMAKE_LINKER:FILEPATH=C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-ld.exe
126+
CMAKE_LINKER:FILEPATH=C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-ld.exe
127127

128128
//No help, variable specified on the command line.
129-
CMAKE_MAKE_PROGRAM:UNINITIALIZED=C:\Users\jeus5771\AppData\Local\Android\Sdk\cmake\3.10.2.4988404\bin\ninja.exe
129+
CMAKE_MAKE_PROGRAM:UNINITIALIZED=C:\Users\start\AppData\Local\Android\Sdk\cmake\3.10.2.4988404\bin\ninja.exe
130130

131131
//Flags used by the linker during the creation of modules.
132132
CMAKE_MODULE_LINKER_FLAGS:STRING=
@@ -144,19 +144,19 @@ CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=
144144
CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
145145

146146
//Path to a program.
147-
CMAKE_NM:FILEPATH=C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-nm.exe
147+
CMAKE_NM:FILEPATH=C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-nm.exe
148148

149149
//Path to a program.
150-
CMAKE_OBJCOPY:FILEPATH=C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-objcopy.exe
150+
CMAKE_OBJCOPY:FILEPATH=C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-objcopy.exe
151151

152152
//Path to a program.
153-
CMAKE_OBJDUMP:FILEPATH=C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-objdump.exe
153+
CMAKE_OBJDUMP:FILEPATH=C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-objdump.exe
154154

155155
//Value Computed by CMake
156156
CMAKE_PROJECT_NAME:STATIC=Project
157157

158158
//Ranlib
159-
CMAKE_RANLIB:FILEPATH=C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-ranlib.exe
159+
CMAKE_RANLIB:FILEPATH=C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-ranlib.exe
160160

161161
//Flags used by the linker during the creation of dll's.
162162
CMAKE_SHARED_LINKER_FLAGS:STRING=
@@ -196,7 +196,7 @@ CMAKE_STATIC_LINKER_FLAGS_RELEASE:STRING=
196196
CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING=
197197

198198
//Path to a program.
199-
CMAKE_STRIP:FILEPATH=C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-strip.exe
199+
CMAKE_STRIP:FILEPATH=C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-strip.exe
200200

201201
//No help, variable specified on the command line.
202202
CMAKE_SYSTEM_NAME:UNINITIALIZED=Android
@@ -205,7 +205,7 @@ CMAKE_SYSTEM_NAME:UNINITIALIZED=Android
205205
CMAKE_SYSTEM_VERSION:UNINITIALIZED=16
206206

207207
//The CMake toolchain file
208-
CMAKE_TOOLCHAIN_FILE:FILEPATH=C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/build/cmake/android.toolchain.cmake
208+
CMAKE_TOOLCHAIN_FILE:FILEPATH=C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/build/cmake/android.toolchain.cmake
209209

210210
//If this value is on, makefiles will be generated without the
211211
// .SILENT directive, and all commands will be echoed to the console
@@ -214,10 +214,13 @@ CMAKE_TOOLCHAIN_FILE:FILEPATH=C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/an
214214
CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
215215

216216
//Value Computed by CMake
217-
Project_BINARY_DIR:STATIC=C:/Users/jeus5771/AndroidStudioProjects/FlappyCow-master/app/.cxx/cmake/debug/armeabi-v7a
217+
Project_BINARY_DIR:STATIC=C:/Users/start/Downloads/FlappyCow-TeamProject/app/.cxx/cmake/debug/armeabi-v7a
218218

219219
//Value Computed by CMake
220-
Project_SOURCE_DIR:STATIC=C:/Users/jeus5771/AndroidStudioProjects/FlappyCow-master/app/src/main/cpp
220+
Project_SOURCE_DIR:STATIC=C:/Users/start/Downloads/FlappyCow-TeamProject/app/src/main/cpp
221+
222+
//Dependencies for target
223+
buttons_LIB_DEPENDS:STATIC=
221224

222225
//Dependencies for target
223226
buzzer_LIB_DEPENDS:STATIC=
@@ -232,7 +235,7 @@ lcd_LIB_DEPENDS:STATIC=
232235
led_LIB_DEPENDS:STATIC=
233236

234237
//Path to a library.
235-
log-lib:FILEPATH=C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/lib/arm-linux-androideabi/16/liblog.so
238+
log-lib:FILEPATH=C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/lib/arm-linux-androideabi/16/liblog.so
236239

237240

238241
########################
@@ -242,19 +245,19 @@ log-lib:FILEPATH=C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21
242245
//ADVANCED property for variable: CMAKE_AR
243246
CMAKE_AR-ADVANCED:INTERNAL=1
244247
//This is the directory where this CMakeCache.txt was created
245-
CMAKE_CACHEFILE_DIR:INTERNAL=c:/Users/jeus5771/AndroidStudioProjects/FlappyCow-master/app/.cxx/cmake/debug/armeabi-v7a
248+
CMAKE_CACHEFILE_DIR:INTERNAL=c:/Users/start/Downloads/FlappyCow-TeamProject/app/.cxx/cmake/debug/armeabi-v7a
246249
//Major version of cmake used to create the current loaded cache
247250
CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
248251
//Minor version of cmake used to create the current loaded cache
249252
CMAKE_CACHE_MINOR_VERSION:INTERNAL=10
250253
//Patch version of cmake used to create the current loaded cache
251254
CMAKE_CACHE_PATCH_VERSION:INTERNAL=2
252255
//Path to CMake executable.
253-
CMAKE_COMMAND:INTERNAL=C:/Users/jeus5771/AppData/Local/Android/Sdk/cmake/3.10.2.4988404/bin/cmake.exe
256+
CMAKE_COMMAND:INTERNAL=C:/Users/start/AppData/Local/Android/Sdk/cmake/3.10.2.4988404/bin/cmake.exe
254257
//Path to cpack program executable.
255-
CMAKE_CPACK_COMMAND:INTERNAL=C:/Users/jeus5771/AppData/Local/Android/Sdk/cmake/3.10.2.4988404/bin/cpack.exe
258+
CMAKE_CPACK_COMMAND:INTERNAL=C:/Users/start/AppData/Local/Android/Sdk/cmake/3.10.2.4988404/bin/cpack.exe
256259
//Path to ctest program executable.
257-
CMAKE_CTEST_COMMAND:INTERNAL=C:/Users/jeus5771/AppData/Local/Android/Sdk/cmake/3.10.2.4988404/bin/ctest.exe
260+
CMAKE_CTEST_COMMAND:INTERNAL=C:/Users/start/AppData/Local/Android/Sdk/cmake/3.10.2.4988404/bin/ctest.exe
258261
//ADVANCED property for variable: CMAKE_CXX_COMPILER_AR
259262
CMAKE_CXX_COMPILER_AR-ADVANCED:INTERNAL=1
260263
//ADVANCED property for variable: CMAKE_CXX_COMPILER_RANLIB
@@ -309,7 +312,7 @@ CMAKE_GENERATOR_PLATFORM:INTERNAL=
309312
CMAKE_GENERATOR_TOOLSET:INTERNAL=
310313
//Source directory with the top level CMakeLists.txt file for this
311314
// project
312-
CMAKE_HOME_DIRECTORY:INTERNAL=C:/Users/jeus5771/AndroidStudioProjects/FlappyCow-master/app/src/main/cpp
315+
CMAKE_HOME_DIRECTORY:INTERNAL=C:/Users/start/Downloads/FlappyCow-TeamProject/app/src/main/cpp
313316
//Install .so files without execute permission.
314317
CMAKE_INSTALL_SO_NO_EXE:INTERNAL=0
315318
//ADVANCED property for variable: CMAKE_LINKER
@@ -337,7 +340,7 @@ CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1
337340
//ADVANCED property for variable: CMAKE_RANLIB
338341
CMAKE_RANLIB-ADVANCED:INTERNAL=1
339342
//Path to CMake installation.
340-
CMAKE_ROOT:INTERNAL=C:/Users/jeus5771/AppData/Local/Android/Sdk/cmake/3.10.2.4988404/share/cmake-3.10
343+
CMAKE_ROOT:INTERNAL=C:/Users/start/AppData/Local/Android/Sdk/cmake/3.10.2.4988404/share/cmake-3.10
341344
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
342345
CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
343346
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG

‎app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/3.10.2/CMakeCCompiler.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
set(CMAKE_C_COMPILER "C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe")
1+
set(CMAKE_C_COMPILER "C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe")
22
set(CMAKE_C_COMPILER_ARG1 "")
33
set(CMAKE_C_COMPILER_ID "Clang")
4-
set(CMAKE_C_COMPILER_VERSION "9.0")
4+
set(CMAKE_C_COMPILER_VERSION "8.0")
55
set(CMAKE_C_COMPILER_VERSION_INTERNAL "")
66
set(CMAKE_C_COMPILER_WRAPPER "")
77
set(CMAKE_C_STANDARD_COMPUTED_DEFAULT "11")
@@ -16,11 +16,11 @@ set(CMAKE_C_SIMULATE_VERSION "")
1616

1717

1818

19-
set(CMAKE_AR "C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-ar.exe")
19+
set(CMAKE_AR "C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-ar.exe")
2020
set(CMAKE_C_COMPILER_AR "CMAKE_C_COMPILER_AR-NOTFOUND")
21-
set(CMAKE_RANLIB "C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-ranlib.exe")
21+
set(CMAKE_RANLIB "C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-ranlib.exe")
2222
set(CMAKE_C_COMPILER_RANLIB "CMAKE_C_COMPILER_RANLIB-NOTFOUND")
23-
set(CMAKE_LINKER "C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-ld.exe")
23+
set(CMAKE_LINKER "C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/bin/arm-linux-androideabi-ld.exe")
2424
set(CMAKE_COMPILER_IS_GNUCC )
2525
set(CMAKE_C_COMPILER_LOADED 1)
2626
set(CMAKE_C_COMPILER_WORKS TRUE)
@@ -69,5 +69,5 @@ endif()
6969

7070

7171
set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "gcc;dl;c;gcc;dl")
72-
set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/toolchains/llvm/prebuilt/windows-x86_64/lib64/clang/9.0.9/lib/linux/arm;C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/toolchains/llvm/prebuilt/windows-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb;C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/toolchains/llvm/prebuilt/windows-x86_64/arm-linux-androideabi/lib/armv7-a/thumb;C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/lib/arm-linux-androideabi/16;C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/lib/arm-linux-androideabi;C:/Users/jeus5771/AppData/Local/Android/Sdk/ndk/android-ndk-r21e/toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/lib")
72+
set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/lib64/clang/8.0.7/lib/linux/arm;C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb;C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/arm-linux-androideabi/lib/armv7-a/thumb;C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/lib/arm-linux-androideabi/16;C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/lib/arm-linux-androideabi;C:/Users/start/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/lib")
7373
set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "")

0 commit comments

Comments
 (0)