Skip to content

Commit

Permalink
full screen
Browse files Browse the repository at this point in the history
  • Loading branch information
cuiwenyao committed Jul 16, 2021
1 parent 1c1ca0d commit 2f5cab1
Show file tree
Hide file tree
Showing 137 changed files with 56,290 additions and 4,399 deletions.
103 changes: 98 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ set(LIBRARY_PATH_CONTRIB ${CMAKE_CURRENT_LIST_DIR}/contrib/lib/)
set(TEST_PATH ${CMAKE_CURRENT_LIST_DIR}/build/test/)
#指定程序的包含目录 库目录
#引用目录
INCLUDE_DIRECTORIES(${INCLUDE_PATH_CODE})
#INCLUDE_DIRECTORIES(${INCLUDE_PATH_CODE})
INCLUDE_DIRECTORIES(${INCLUDE_PATH_CONTRIB})
INCLUDE_DIRECTORIES(${TEST_PATH}/include)
#库目录 将生成的lib 目录也包含在内,为了给test使用
Expand Down Expand Up @@ -65,7 +65,7 @@ INSTALL(FILES
)
endif()

if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/dll/assimp-vc142-mt.dll)
if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/dll/assimp-vc142-mt.dll)
INSTALL(FILES
${CMAKE_CURRENT_LIST_DIR}/dll/assimp-vc142-mt.dll
DESTINATION
Expand All @@ -74,7 +74,7 @@ INSTALL(FILES
endif()


#对 test 增加支持 dll release
#对 test 增加支持 dll release test 所有的引用都来原来自include中的
INSTALL(FILES
${CMAKE_CURRENT_LIST_DIR}/bin/assimp-vc142-mt.dll
DESTINATION
Expand All @@ -96,17 +96,110 @@ INSTALL(FILES
DESTINATION
${CMAKE_CURRENT_LIST_DIR}/build/test/Debug
)

FILE(
GLOB_RECURSE Header_Driver
${CODE_ROOT_PATH}/Driver/*.hpp
)
FILE(
GLOB_RECURSE Header_Driver_LocalDriver
${CODE_ROOT_PATH}/Driver/LocalDriver/*.h
)
FILE(
GLOB_RECURSE Header_Driver_Global
${CODE_ROOT_PATH}/Driver/GlobalDriver/*.h
)
#SRC_Element
FILE(
GLOB_RECURSE Header_Element
${CODE_ROOT_PATH}/Element/*.h
)
#SRC_Resource
FILE(
GLOB_RECURSE Header_Resource
${CODE_ROOT_PATH}/Resource/*.h
)
#SRC_Resource
FILE(
GLOB_RECURSE Header_Scene
${CODE_ROOT_PATH}/Scene/*.h
)
#SRC_Sync
FILE(
GLOB_RECURSE Header_Sync
${CODE_ROOT_PATH}/Sync/*.h
)
INSTALL(
FILES
${Header_Driver}
DESTINATION
${INCLUDE_PATH_CODE}/Driver/
)
INSTALL(
FILES
${Header_Driver_LocalDriver}
DESTINATION
${INCLUDE_PATH_CODE}/Driver/LocalDriver/
)
INSTALL(
FILES
${Header_Driver_Global}
DESTINATION
${INCLUDE_PATH_CODE}/Driver/GlobalDriver/
)
INSTALL(
FILES
${Header_Element}
DESTINATION
${INCLUDE_PATH_CODE}/Element/
)
INSTALL(
FILES
${Header_Resource}
DESTINATION
${INCLUDE_PATH_CODE}/Resource/
)
INSTALL(
FILES
${Header_Scene}
DESTINATION
${INCLUDE_PATH_CODE}/Scene/
)
INSTALL(
FILES
${Header_Sync}
DESTINATION
${INCLUDE_PATH_CODE}/Sync/
)
INSTALL(
DIRECTORY
${CMAKE_CURRENT_LIST_DIR}/code/Scxmlexample
DESTINATION
${CMAKE_CURRENT_LIST_DIR}/include/
)
INSTALL(
DIRECTORY
${CMAKE_CURRENT_LIST_DIR}/code/resources
DESTINATION
${CMAKE_CURRENT_LIST_DIR}/include/
)
INSTALL(
DIRECTORY
${CMAKE_CURRENT_LIST_DIR}/code/GLSL
DESTINATION
${CMAKE_CURRENT_LIST_DIR}/include/
)
# example
INSTALL(
DIRECTORY
${CODE_ROOT_PATH}/Scxmlexample
${CMAKE_CURRENT_LIST_DIR}/include/Scxmlexample
DESTINATION
${TEST_PATH}/
)
# resources
INSTALL(
DIRECTORY
${CODE_ROOT_PATH}/resources
${CMAKE_CURRENT_LIST_DIR}/include/resources
DESTINATION
${TEST_PATH}/
)
Expand Down
59 changes: 55 additions & 4 deletions code/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,65 @@

#code 中的所有文件
FILE(GLOB_RECURSE SOURCE_CODE
Component/*
Driver/*
Driver/LocalDriver/*
Driver/Global/*
Driver/GlobalDriver/*
Element/*
Resource/*
Scene/*
Sync/*
${INCLUDE_PATH_CONTRIB}/*.c
)

#组织 file
#Driver
FILE(
GLOB_RECURSE SRC_Driver
Driver/*.hpp
)
source_group(Driver FILES ${SRC_Driver})
FILE(
GLOB_RECURSE SRC_Driver_LocalDriver
Driver/LocalDriver/*
)
source_group(Driver//LocalDriver FILES ${SRC_Driver_LocalDriver})
FILE(
GLOB_RECURSE SRC_Driver_Global
Driver/GlobalDriver/*
)
source_group(Driver//GlobalDriver FILES ${SRC_Driver_Global})
#SRC_Element
FILE(
GLOB_RECURSE SRC_Element
Element/*
)
source_group(Element FILES ${SRC_Element})
#SRC_Resource
FILE(
GLOB_RECURSE SRC_Resource
Resource/*
)
source_group(Resource FILES ${SRC_Resource})
#SRC_Resource
FILE(
GLOB_RECURSE SRC_Scene
Scene/*
)
source_group(Scene FILES ${SRC_Scene})
#SRC_Sync
FILE(
GLOB_RECURSE SRC_Sync
Sync/*
)
source_group(Sync FILES ${SRC_Sync})
#xml
FILE(
GLOB_RECURSE SRC_Scxmlexample
${CODE_ROOT_PATH}/Scxmlexample/*.xml
)
source_group(Scxmlexample FILES ${SRC_Scxmlexample})




FILE(
Expand All @@ -21,7 +69,7 @@ FILE(
)

#生成链接库
add_library(XYY_Game_Engine SHARED ${SOURCE_CODE})
add_library(XYY_Game_Engine SHARED ${SOURCE_CODE} ${SRC_Scxmlexample})
SetDefaultTargetProperties(XYY_Game_Engine)
# 应该还要加上 opengl32.lib
target_link_libraries(XYY_Game_Engine
Expand All @@ -41,4 +89,7 @@ oleaut32.lib
uuid.lib
odbc32.lib
odbccp32.lib
)
)



79 changes: 0 additions & 79 deletions code/Component/_Scene.cpp

This file was deleted.

34 changes: 0 additions & 34 deletions code/Component/_Scene.h

This file was deleted.

43 changes: 0 additions & 43 deletions code/Component/_Window.cpp

This file was deleted.

Loading

0 comments on commit 2f5cab1

Please sign in to comment.