Merge pull request #1 from happyme531/dev

dev
happyme531 · May 1, 2020 · 16e4ad5 · 16e4ad5
2 parents 7cd8c6c + 058aece
commit 16e4ad5
Show file tree

Hide file tree

Showing 10 changed files with 1,421 additions and 34 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -5,6 +5,61 @@
         "*.in": "cpp",
         "iostream": "cpp",
         "ostream": "cpp",
-        "*.rh": "cpp"
+        "*.rh": "cpp",
+        "algorithm": "cpp",
+        "array": "cpp",
+        "cctype": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "concepts": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "deque": "cpp",
+        "exception": "cpp",
+        "fstream": "cpp",
+        "functional": "cpp",
+        "initializer_list": "cpp",
+        "ios": "cpp",
+        "iosfwd": "cpp",
+        "istream": "cpp",
+        "iterator": "cpp",
+        "limits": "cpp",
+        "list": "cpp",
+        "map": "cpp",
+        "memory": "cpp",
+        "new": "cpp",
+        "optional": "cpp",
+        "queue": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "string": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "typeinfo": "cpp",
+        "unordered_map": "cpp",
+        "utility": "cpp",
+        "vector": "cpp",
+        "xfacet": "cpp",
+        "xhash": "cpp",
+        "xiosbase": "cpp",
+        "xlocale": "cpp",
+        "xlocinfo": "cpp",
+        "xlocnum": "cpp",
+        "xmemory": "cpp",
+        "xstddef": "cpp",
+        "xstring": "cpp",
+        "xtr1common": "cpp",
+        "xtree": "cpp",
+        "xutility": "cpp",
+        "random": "cpp",
+        "chrono": "cpp",
+        "thread": "cpp"
     }
 }
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,15 +3,19 @@ project(pvz-randomEventWall)
 
 set (pvz-randomEventWall_VERSION_MAJOR 0)
 set (pvz-randomEventWall_VERSION_MINOR 1)
-
+set(CMAKE_CXX_FLAGS "/std:c++latest ${CMAKE_CXX_FLAGS}")
+SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFESTUAC:level='requireAdministrator'")
 configure_file(
     "${PROJECT_SOURCE_DIR}/randomEventWall/include/config.h.in"
     "${pvz-randomEventWall_BINARY_DIR}/randomEventWall/config.h"
 )
 
-aux_source_directory(./randomEventWall DIR_SRCS)
+aux_source_directory(./randomEventWall/ DIR_SRCS)
 aux_source_directory(./randomEventWall/include DIR_SRCS)
+aux_source_directory(./randomEventWall/components DIR_SRCS)
+aux_source_directory(./randomEventWall/components/include DIR_SRCS)
 include_directories(DIR_SRCS)
+
 aux_source_directory(./pvzclass/pvzclass DIR_LIB_SRCS)
 aux_source_directory(./pvzclass/pvzclass/Classes DIR_LIB_SRCS)
 aux_source_directory(./pvzclass/pvzclass/Enums DIR_LIB_SRCS)
@@ -21,9 +25,10 @@ include_directories(DIR_LIB_SRCS)
 #list(REMOVE_ITEM DIR_LIB_SRCS "pvzclass\pvzclass\pvzclass.cpp" "pvzclass\pvzclass\pvzclass.h")
 add_library (libpvzclass STATIC ${DIR_LIB_SRCS})
 
-
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 
 add_executable(pvz-randomEventWall ${DIR_SRCS}) 
+
+
 target_link_libraries(pvz-randomEventWall libpvzclass)