Compiling again

This commit is contained in:
2022-02-27 09:33:55 -08:00
parent cb6f9eaaa9
commit 4f0e1a37c5
8 changed files with 7 additions and 22 deletions

View File

@ -57,11 +57,8 @@ add_subdirectory(tools)
# Include the client or the test tools
if(TARGET_TYPE STREQUAL test)
add_subdirectory(test)
elseif(TARGET_TYPE STREQUAL game)
add_subdirectory(client)
endif()
# Set up shared assets
tool_copy(shader_textured
${ASSETS_SOURCE_DIR}/shared/shaders/textured.vert shaders/textured.vert

View File

@ -3,7 +3,7 @@
# This software is released under the MIT License.
# https://opensource.org/licenses/MIT
add_subdirectory(Unity)
# add_subdirectory(Unity)
add_subdirectory(cglm)
add_subdirectory(glfw)
add_subdirectory(duktape)

View File

@ -10,7 +10,6 @@ target_link_libraries(${PROJECT_NAME}
glad
cglm
stb
# duktape
)
target_include_directories(${PROJECT_NAME}
@ -38,5 +37,8 @@ add_subdirectory(scene)
add_subdirectory(util)
# add_subdirectory(vn)
# Add Game Sources
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/games/${TARGET_GAME})
# Add client and game
if(TARGET_TYPE STREQUAL game)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/games/${TARGET_GAME})
add_subdirectory(client)
endif()

View File

@ -3,5 +3,4 @@
# This software is released under the MIT License.
# https://opensource.org/licenses/MIT
add_subdirectory(glfwclient)

View File

@ -3,13 +3,6 @@
# This software is released under the MIT License.
# https://opensource.org/licenses/MIT
# Definitions
add_compile_definitions(
SETTING_PLATFORM_GLFW=1
SETTING_PLATFORM=1
SETTING_PLATFORM_USE_GLAD=1
)
# Libraries
target_link_libraries(${PROJECT_NAME}
PUBLIC
@ -20,10 +13,4 @@ target_link_libraries(${PROJECT_NAME}
target_sources(${PROJECT_NAME}
PRIVATE
glfwclient.c
)
# Includes
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_LIST_DIR}
)

View File

@ -25,7 +25,7 @@
#if defined(_WIN32) || defined(_WIN64)
// Windows Fixes
# define strtok_r strtok_s
# define sleep(n) _sleep(n)
# define sleep(n) Sleep(n)
#include <windows.h>