Skip to content

Commit

Permalink
final clean
Browse files Browse the repository at this point in the history
  • Loading branch information
isakura313 committed Mar 24, 2024
1 parent c1e9742 commit 0f883bc
Show file tree
Hide file tree
Showing 36 changed files with 160 additions and 172 deletions.
Binary file modified .DS_Store
Binary file not shown.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.14)
project(untitled)
project(tetris)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")

set(SOURCE_FILES main.cpp)
add_executable(untitled ${SOURCE_FILES})
add_executable(tetris ${SOURCE_FILES})
include_directories(/usr/local/include)

find_package(SFML 2.5 COMPONENTS system window graphics network audio REQUIRED)
include_directories(${SFML_INCLUDE_DIRS})
target_link_libraries(untitled sfml-system sfml-window sfml-graphics sfml-audio sfml-network)
target_link_libraries(tetris sfml-system sfml-window sfml-graphics sfml-audio sfml-network)
Binary file removed background.jpg
Binary file not shown.
Binary file removed background.png
Binary file not shown.
Binary file removed ball.png
Binary file not shown.
Binary file removed canon.png
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
}
],
"type" : "INTERNAL",
"value" : "/Users/isakura313/Desktop/untitled/cmake-build-debug"
"value" : "/Users/isakura313/Desktop/tetris/cmake-build-debug"
},
{
"name" : "CMAKE_CACHE_MAJOR_VERSION",
Expand Down Expand Up @@ -479,7 +479,7 @@
}
],
"type" : "STATIC",
"value" : "/Users/isakura313/Desktop/untitled/cmake-build-debug/CMakeFiles/pkgRedirects"
"value" : "/Users/isakura313/Desktop/tetris/cmake-build-debug/CMakeFiles/pkgRedirects"
},
{
"name" : "CMAKE_GENERATOR",
Expand Down Expand Up @@ -539,7 +539,7 @@
}
],
"type" : "INTERNAL",
"value" : "/Users/isakura313/Desktop/untitled"
"value" : "/Users/isakura313/Desktop/tetris"
},
{
"name" : "CMAKE_INSTALL_NAME_TOOL",
Expand Down Expand Up @@ -759,7 +759,7 @@
}
],
"type" : "STRING",
"value" : "14.1"
"value" : ""
},
{
"name" : "CMAKE_OSX_SYSROOT",
Expand Down Expand Up @@ -819,7 +819,7 @@
}
],
"type" : "STATIC",
"value" : "untitled"
"value" : "tetris"
},
{
"name" : "CMAKE_RANLIB",
Expand Down Expand Up @@ -1142,7 +1142,7 @@
"value" : "/opt/homebrew/share/doc/SFML"
},
{
"name" : "untitled_BINARY_DIR",
"name" : "tetris_BINARY_DIR",
"properties" :
[
{
Expand All @@ -1151,10 +1151,10 @@
}
],
"type" : "STATIC",
"value" : "/Users/isakura313/Desktop/untitled/cmake-build-debug"
"value" : "/Users/isakura313/Desktop/tetris/cmake-build-debug"
},
{
"name" : "untitled_IS_TOP_LEVEL",
"name" : "tetris_IS_TOP_LEVEL",
"properties" :
[
{
Expand All @@ -1166,7 +1166,7 @@
"value" : "ON"
},
{
"name" : "untitled_SOURCE_DIR",
"name" : "tetris_SOURCE_DIR",
"properties" :
[
{
Expand All @@ -1175,7 +1175,7 @@
}
],
"type" : "STATIC",
"value" : "/Users/isakura313/Desktop/untitled"
"value" : "/Users/isakura313/Desktop/tetris"
}
],
"kind" : "cache",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1223,8 +1223,8 @@
"kind" : "cmakeFiles",
"paths" :
{
"build" : "/Users/isakura313/Desktop/untitled/cmake-build-debug",
"source" : "/Users/isakura313/Desktop/untitled"
"build" : "/Users/isakura313/Desktop/tetris/cmake-build-debug",
"source" : "/Users/isakura313/Desktop/tetris"
},
"version" :
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
[
0
],
"name" : "untitled",
"name" : "tetris",
"targetIndexes" :
[
0
Expand All @@ -38,9 +38,9 @@
[
{
"directoryIndex" : 0,
"id" : "untitled::@6890427a1f51a3e7e1df",
"jsonFile" : "target-untitled-Debug-16558042b5fb409266ef.json",
"name" : "untitled",
"id" : "tetris::@6890427a1f51a3e7e1df",
"jsonFile" : "target-tetris-Debug-7fb0d2d2ec5971cc8e21.json",
"name" : "tetris",
"projectIndex" : 0
}
]
Expand All @@ -49,8 +49,8 @@
"kind" : "codemodel",
"paths" :
{
"build" : "/Users/isakura313/Desktop/untitled/cmake-build-debug",
"source" : "/Users/isakura313/Desktop/untitled"
"build" : "/Users/isakura313/Desktop/tetris/cmake-build-debug",
"source" : "/Users/isakura313/Desktop/tetris"
},
"version" :
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"objects" :
[
{
"jsonFile" : "codemodel-v2-05a360c725a0734c57e8.json",
"jsonFile" : "codemodel-v2-afc3430432715b5a8315.json",
"kind" : "codemodel",
"version" :
{
Expand All @@ -35,7 +35,7 @@
}
},
{
"jsonFile" : "cache-v2-cfd7ad4c524ac4d1e89f.json",
"jsonFile" : "cache-v2-199eda6b0e241c55cf4f.json",
"kind" : "cache",
"version" :
{
Expand All @@ -44,7 +44,7 @@
}
},
{
"jsonFile" : "cmakeFiles-v1-6394ed4d40cc386cc9af.json",
"jsonFile" : "cmakeFiles-v1-9019edb676a168448110.json",
"kind" : "cmakeFiles",
"version" :
{
Expand All @@ -66,7 +66,7 @@
{
"cache-v2" :
{
"jsonFile" : "cache-v2-cfd7ad4c524ac4d1e89f.json",
"jsonFile" : "cache-v2-199eda6b0e241c55cf4f.json",
"kind" : "cache",
"version" :
{
Expand All @@ -76,7 +76,7 @@
},
"cmakeFiles-v1" :
{
"jsonFile" : "cmakeFiles-v1-6394ed4d40cc386cc9af.json",
"jsonFile" : "cmakeFiles-v1-9019edb676a168448110.json",
"kind" : "cmakeFiles",
"version" :
{
Expand All @@ -86,7 +86,7 @@
},
"codemodel-v2" :
{
"jsonFile" : "codemodel-v2-05a360c725a0734c57e8.json",
"jsonFile" : "codemodel-v2-afc3430432715b5a8315.json",
"kind" : "codemodel",
"version" :
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"artifacts" :
[
{
"path" : "untitled"
"path" : "tetris"
}
],
"backtrace" : 1,
Expand Down Expand Up @@ -49,7 +49,7 @@
"compileCommandFragments" :
[
{
"fragment" : " -std=c++17 -g -arch arm64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.4.sdk -mmacosx-version-min=14.1 -fcolor-diagnostics"
"fragment" : " -std=c++17 -g -arch arm64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.4.sdk -fcolor-diagnostics"
}
],
"includes" :
Expand All @@ -71,7 +71,7 @@
]
}
],
"id" : "untitled::@6890427a1f51a3e7e1df",
"id" : "tetris::@6890427a1f51a3e7e1df",
"link" :
{
"commandFragments" :
Expand Down Expand Up @@ -116,8 +116,8 @@
],
"language" : "CXX"
},
"name" : "untitled",
"nameOnDisk" : "untitled",
"name" : "tetris",
"nameOnDisk" : "tetris",
"paths" :
{
"build" : ".",
Expand Down
Binary file modified cmake-build-debug/.ninja_deps
Binary file not shown.
31 changes: 21 additions & 10 deletions cmake-build-debug/.ninja_log
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
# ninja log v5
20 526 1711273352298667055 CMakeFiles/untitled.dir/main.cpp.o 663be03a6d60196e
527 570 1711273352344429815 untitled 17928892a736b80
7 380 1711273420533167665 CMakeFiles/untitled.dir/main.cpp.o 663be03a6d60196e
380 411 1711273420567026436 untitled 17928892a736b80
6 408 1711273448645108497 CMakeFiles/untitled.dir/main.cpp.o 663be03a6d60196e
408 444 1711273448682150629 untitled 17928892a736b80
7 490 1711273472952374062 CMakeFiles/untitled.dir/main.cpp.o 663be03a6d60196e
490 527 1711273472990365689 untitled 17928892a736b80
8 725 1711274302153464594 CMakeFiles/untitled.dir/main.cpp.o 663be03a6d60196e
725 894 1711274302323461905 untitled 17928892a736b80
390 425 1711275378837552001 untitled 17928892a736b80
2 507 1711276428863206028 CMakeFiles/tetris.dir/main.cpp.o e6cbe58434db6762
509 546 1711276428904070501 tetris 7d28cb9100b31f88
7 467 1711276535351009084 CMakeFiles/tetris.dir/main.cpp.o e6cbe58434db6762
467 503 1711276535388739145 tetris 7d28cb9100b31f88
6 469 1711276643142141359 CMakeFiles/tetris.dir/main.cpp.o e6cbe58434db6762
469 505 1711276643179477102 tetris 7d28cb9100b31f88
7 481 1711276716975244271 CMakeFiles/tetris.dir/main.cpp.o e6cbe58434db6762
481 519 1711276717014903594 tetris 7d28cb9100b31f88
6 466 1711276854869457565 CMakeFiles/tetris.dir/main.cpp.o e6cbe58434db6762
466 500 1711276854904530741 tetris 7d28cb9100b31f88
5 452 1711277054428826311 CMakeFiles/tetris.dir/main.cpp.o e6cbe58434db6762
452 487 1711277054466794642 tetris 7d28cb9100b31f88
6 381 1711277061628765707 CMakeFiles/tetris.dir/main.cpp.o e6cbe58434db6762
381 413 1711277061663665385 tetris 7d28cb9100b31f88
5 385 1711277067270607361 CMakeFiles/tetris.dir/main.cpp.o e6cbe58434db6762
385 416 1711277067305700579 tetris 7d28cb9100b31f88
6 379 1711277072807809898 CMakeFiles/tetris.dir/main.cpp.o e6cbe58434db6762
379 410 1711277072842071828 tetris 7d28cb9100b31f88
5 381 1711277078289793016 CMakeFiles/tetris.dir/main.cpp.o e6cbe58434db6762
381 413 1711277078323302700 tetris 7d28cb9100b31f88
18 changes: 9 additions & 9 deletions cmake-build-debug/CMakeCache.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This is the CMakeCache file.
# For build in directory: /Users/isakura313/Desktop/untitled/cmake-build-debug
# For build in directory: /Users/isakura313/Desktop/tetris/cmake-build-debug
# It was generated by CMake: /Users/isakura313/Applications/CLion Nova.app/Contents/bin/cmake/mac/aarch64/bin/cmake
# You can edit this file to change values found and used by cmake.
# If you do not want to change any of the values, simply exit the editor.
Expand Down Expand Up @@ -85,7 +85,7 @@ CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=

//Value Computed by CMake.
CMAKE_FIND_PACKAGE_REDIRECTS_DIR:STATIC=/Users/isakura313/Desktop/untitled/cmake-build-debug/CMakeFiles/pkgRedirects
CMAKE_FIND_PACKAGE_REDIRECTS_DIR:STATIC=/Users/isakura313/Desktop/tetris/cmake-build-debug/CMakeFiles/pkgRedirects

//Path to a program.
CMAKE_INSTALL_NAME_TOOL:FILEPATH=/usr/bin/install_name_tool
Expand Down Expand Up @@ -133,7 +133,7 @@ CMAKE_OSX_ARCHITECTURES:STRING=

//Minimum OS X version to target for deployment (at runtime); newer
// APIs weak linked. Set to empty string for default value.
CMAKE_OSX_DEPLOYMENT_TARGET:STRING=14.1
CMAKE_OSX_DEPLOYMENT_TARGET:STRING=

//The product will be built against the headers and libraries located
// inside the indicated SDK.
Expand All @@ -146,7 +146,7 @@ CMAKE_PROJECT_DESCRIPTION:STATIC=
CMAKE_PROJECT_HOMEPAGE_URL:STATIC=

//Value Computed by CMake
CMAKE_PROJECT_NAME:STATIC=untitled
CMAKE_PROJECT_NAME:STATIC=tetris

//Path to a program.
CMAKE_RANLIB:FILEPATH=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib
Expand Down Expand Up @@ -220,13 +220,13 @@ SFML_DIR:PATH=/opt/homebrew/lib/cmake/SFML
SFML_DOC_DIR:PATH=/opt/homebrew/share/doc/SFML

//Value Computed by CMake
untitled_BINARY_DIR:STATIC=/Users/isakura313/Desktop/untitled/cmake-build-debug
tetris_BINARY_DIR:STATIC=/Users/isakura313/Desktop/tetris/cmake-build-debug

//Value Computed by CMake
untitled_IS_TOP_LEVEL:STATIC=ON
tetris_IS_TOP_LEVEL:STATIC=ON

//Value Computed by CMake
untitled_SOURCE_DIR:STATIC=/Users/isakura313/Desktop/untitled
tetris_SOURCE_DIR:STATIC=/Users/isakura313/Desktop/tetris


########################
Expand All @@ -238,7 +238,7 @@ CMAKE_ADDR2LINE-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_AR
CMAKE_AR-ADVANCED:INTERNAL=1
//This is the directory where this CMakeCache.txt was created
CMAKE_CACHEFILE_DIR:INTERNAL=/Users/isakura313/Desktop/untitled/cmake-build-debug
CMAKE_CACHEFILE_DIR:INTERNAL=/Users/isakura313/Desktop/tetris/cmake-build-debug
//Major version of cmake used to create the current loaded cache
CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
//Minor version of cmake used to create the current loaded cache
Expand Down Expand Up @@ -303,7 +303,7 @@ CMAKE_GENERATOR_PLATFORM:INTERNAL=
CMAKE_GENERATOR_TOOLSET:INTERNAL=
//Source directory with the top level CMakeLists.txt file for this
// project
CMAKE_HOME_DIRECTORY:INTERNAL=/Users/isakura313/Desktop/untitled
CMAKE_HOME_DIRECTORY:INTERNAL=/Users/isakura313/Desktop/tetris
//ADVANCED property for variable: CMAKE_INSTALL_NAME_TOOL
CMAKE_INSTALL_NAME_TOOL-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_LINKER
Expand Down
Binary file not shown.
Binary file not shown.
8 changes: 4 additions & 4 deletions cmake-build-debug/CMakeFiles/3.28.1/CMakeSystem.cmake
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
set(CMAKE_HOST_SYSTEM "Darwin-23.1.0")
set(CMAKE_HOST_SYSTEM "Darwin-23.4.0")
set(CMAKE_HOST_SYSTEM_NAME "Darwin")
set(CMAKE_HOST_SYSTEM_VERSION "23.1.0")
set(CMAKE_HOST_SYSTEM_VERSION "23.4.0")
set(CMAKE_HOST_SYSTEM_PROCESSOR "arm64")



set(CMAKE_SYSTEM "Darwin-23.1.0")
set(CMAKE_SYSTEM "Darwin-23.4.0")
set(CMAKE_SYSTEM_NAME "Darwin")
set(CMAKE_SYSTEM_VERSION "23.1.0")
set(CMAKE_SYSTEM_VERSION "23.4.0")
set(CMAKE_SYSTEM_PROCESSOR "arm64")

set(CMAKE_CROSSCOMPILING "FALSE")
Expand Down
Loading

0 comments on commit 0f883bc

Please sign in to comment.