5-8 20:10 commit

kaipol · May 8, 2023 · b76c8d6 · b76c8d6
1 parent db0f59e
commit b76c8d6
Show file tree

Hide file tree

Showing 680 changed files with 47,560 additions and 42,097 deletions.
diff --git a/.history/Survivor-Game-Main/CMakeLists_20230508183059.txt b/.history/Survivor-Game-Main/CMakeLists_20230508183059.txt
@@ -0,0 +1,72 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(Survivor-Game-Main VERSION 0.1 LANGUAGES CXX)
+
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Multimedia)
+
+set(PROJECT_SOURCES
+main.cpp
+mainwindow.cpp
+mainwindow.h
+mainwindow.ui
+Characters.h
+Characters.cpp
+MainInterface.h
+MainInterface.cpp
+SelectHeroes.h
+SelectHeroes.cpp
+FightInterface.h
+FightInterface.cpp
+
+)
+
+if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
+qt_add_executable(Survivor-Game-Main
+MANUAL_FINALIZATION
+${PROJECT_SOURCES}
+)
+# Define target properties for Android with Qt 6 as:
+#    set_property(TARGET Survivor-Game-Main APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
+#                 ${CMAKE_CURRENT_SOURCE_DIR}/android)
+# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
+else()
+if(ANDROID)
+add_library(Survivor-Game-Main SHARED
+${PROJECT_SOURCES}
+)
+# Define properties for Android with Qt 5 after find_package() calls as:
+#    set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
+else()
+add_executable(Survivor-Game-Main
+${PROJECT_SOURCES}
+)
+endif()
+endif()
+
+target_link_libraries(Survivor-Game-Main PRIVATE Qt6::Multimedia)
+target_link_libraries(Survivor-Game-Main PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
+
+set_target_properties(Survivor-Game-Main PROPERTIES
+    MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
+    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
+    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+    MACOSX_BUNDLE TRUE
+    WIN32_EXECUTABLE TRUE
+)
+
+install(TARGETS Survivor-Game-Main
+    BUNDLE DESTINATION .
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+if(QT_VERSION_MAJOR EQUAL 6)
+    qt_finalize_executable(Survivor-Game-Main)
+endif()
diff --git a/.history/Survivor-Game-Main/CMakeLists_20230508183153.txt b/.history/Survivor-Game-Main/CMakeLists_20230508183153.txt
@@ -0,0 +1,72 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(Survivor-Game-Main VERSION 0.1 LANGUAGES CXX)
+
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Multimedia)
+
+set(PROJECT_SOURCES
+main.cpp
+mainwindow.cpp
+mainwindow.h
+mainwindow.ui
+Characters.h
+Characters.cpp
+MainInterface.h
+MainInterface.cpp
+SelectHeroes.h
+SelectHeroes.cpp
+FightInterface.h
+FightInterface.cpp
+
+)
+
+if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
+qt_add_executable(Survivor-Game-Main
+MANUAL_FINALIZATION
+${PROJECT_SOURCES}
+)
+# Define target properties for Android with Qt 6 as:
+#    set_property(TARGET Survivor-Game-Main APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
+#                 ${CMAKE_CURRENT_SOURCE_DIR}/android)
+# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
+else()
+if(ANDROID)
+add_library(Survivor-Game-Main SHARED
+${PROJECT_SOURCES}
+)
+# Define properties for Android with Qt 5 after find_package() calls as:
+#    set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
+else()
+add_executable(Survivor-Game-Main
+${PROJECT_SOURCES}
+)
+endif()
+endif()
+
+target_link_libraries(Survivor-Game-Main PRIVATE Qt6::Multimedia)
+target_link_libraries(Survivor-Game-Main PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
+
+set_target_properties(Survivor-Game-Main PROPERTIES
+    MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
+    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
+    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+    MACOSX_BUNDLE TRUE
+    WIN32_EXECUTABLE TRUE
+)
+
+install(TARGETS Survivor-Game-Main
+    BUNDLE DESTINATION .
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+if(QT_VERSION_MAJOR EQUAL 6)
+    qt_finalize_executable(Survivor-Game-Main)
+endif()
diff --git a/.history/Survivor-Game-Main/CMakeLists_20230508183221.txt b/.history/Survivor-Game-Main/CMakeLists_20230508183221.txt
@@ -0,0 +1,72 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(Survivor-Game-Main VERSION 0.1 LANGUAGES CXX)
+
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Multimedia)
+
+set(PROJECT_SOURCES
+main.cpp
+mainwindow.cpp
+mainwindow.h
+mainwindow.ui
+Characters.h
+Characters.cpp
+MainInterface.h
+MainInterface.cpp
+SelectHeroes.h
+SelectHeroes.cpp
+FightInterface.h
+FightInterface.cpp
+
+)
+
+if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
+qt_add_executable(Survivor-Game-Main
+MANUAL_FINALIZATION
+${PROJECT_SOURCES}
+)
+# Define target properties for Android with Qt 6 as:
+#    set_property(TARGET Survivor-Game-Main APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
+#                 ${CMAKE_CURRENT_SOURCE_DIR}/android)
+# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
+else()
+if(ANDROID)
+add_library(Survivor-Game-Main SHARED
+${PROJECT_SOURCES}
+)
+# Define properties for Android with Qt 5 after find_package() calls as:
+#    set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
+else()
+add_executable(Survivor-Game-Main
+${PROJECT_SOURCES}
+)
+endif()
+endif()
+
+target_link_libraries(Survivor-Game-Main PRIVATE Qt6::Multimedia)
+target_link_libraries(Survivor-Game-Main PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
+
+set_target_properties(Survivor-Game-Main PROPERTIES
+    MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
+    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
+    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+    MACOSX_BUNDLE TRUE
+    WIN32_EXECUTABLE TRUE
+)
+
+install(TARGETS Survivor-Game-Main
+    BUNDLE DESTINATION .
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+if(QT_VERSION_MAJOR EQUAL 6)
+    qt_finalize_executable(Survivor-Game-Main)
+endif()
diff --git a/.history/Survivor-Game-Main/CMakeLists_20230508183423.txt b/.history/Survivor-Game-Main/CMakeLists_20230508183423.txt
@@ -0,0 +1,72 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(Survivor-Game-Main VERSION 0.1 LANGUAGES CXX)
+
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Multimedia)
+
+set(PROJECT_SOURCES
+main.cpp
+mainwindow.cpp
+mainwindow.h
+mainwindow.ui
+Characters.h
+Characters.cpp
+MainInterface.h
+MainInterface.cpp
+SelectHeroes.h
+SelectHeroes.cpp
+FightInterface.h
+FightInterface.cpp
+
+)
+
+if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
+qt_add_executable(Survivor-Game-Main
+MANUAL_FINALIZATION
+${PROJECT_SOURCES}
+)
+# Define target properties for Android with Qt 6 as:
+#    set_property(TARGET Survivor-Game-Main APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
+#                 ${CMAKE_CURRENT_SOURCE_DIR}/android)
+# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
+else()
+if(ANDROID)
+add_library(Survivor-Game-Main SHARED
+${PROJECT_SOURCES}
+)
+# Define properties for Android with Qt 5 after find_package() calls as:
+#    set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
+else()
+add_executable(Survivor-Game-Main
+${PROJECT_SOURCES}
+)
+endif()
+endif()
+
+target_link_libraries(Survivor-Game-Main PRIVATE Qt6::Multimedia)
+target_link_libraries(Survivor-Game-Main PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
+
+set_target_properties(Survivor-Game-Main PROPERTIES
+    MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
+    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
+    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+    MACOSX_BUNDLE TRUE
+    WIN32_EXECUTABLE TRUE
+)
+
+install(TARGETS Survivor-Game-Main
+    BUNDLE DESTINATION .
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+if(QT_VERSION_MAJOR EQUAL 6)
+    qt_finalize_executable(Survivor-Game-Main)
+endif()
diff --git a/.history/Survivor-Game-Main/CMakeLists_20230508183927.txt b/.history/Survivor-Game-Main/CMakeLists_20230508183927.txt
@@ -0,0 +1,72 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(Survivor-Game-Main VERSION 0.1 LANGUAGES CXX)
+
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Multimedia)
+
+set(PROJECT_SOURCES
+main.cpp
+mainwindow.cpp
+mainwindow.h
+mainwindow.ui
+Characters.h
+Characters.cpp
+MainInterface.h
+MainInterface.cpp
+SelectHeroes.h
+SelectHeroes.cpp
+FightInterface.h
+FightInterface.cpp
+
+)
+
+if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
+qt_add_executable(Survivor-Game-Main
+MANUAL_FINALIZATION
+${PROJECT_SOURCES}
+)
+# Define target properties for Android with Qt 6 as:
+#    set_property(TARGET Survivor-Game-Main APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
+#                 ${CMAKE_CURRENT_SOURCE_DIR}/android)
+# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
+else()
+if(ANDROID)
+add_library(Survivor-Game-Main SHARED
+${PROJECT_SOURCES}
+)
+# Define properties for Android with Qt 5 after find_package() calls as:
+#    set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
+else()
+add_executable(Survivor-Game-Main
+${PROJECT_SOURCES}
+)
+endif()
+endif()
+
+target_link_libraries(Survivor-Game-Main PRIVATE Qt6::Multimedia)
+target_link_libraries(Survivor-Game-Main PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
+
+set_target_properties(Survivor-Game-Main PROPERTIES
+    MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
+    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
+    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+    MACOSX_BUNDLE TRUE
+    WIN32_EXECUTABLE TRUE
+)
+
+install(TARGETS Survivor-Game-Main
+    BUNDLE DESTINATION .
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+if(QT_VERSION_MAJOR EQUAL 6)
+    qt_finalize_executable(Survivor-Game-Main)
+endif()