Commit f22c1167 authored by Georg Schäfer's avatar Georg Schäfer
Browse files

fix warning and some settings

parent c39d8570
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "(gdb) Launch",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/../build/${workspaceFolderBasename}/Game",
"args": [],
"stopAtEntry": false,
"cwd": "${workspaceFolder}/../build/${workspaceFolderBasename}/",
"environment": [],
"externalConsole": false,
"MIMode": "gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
"text": "-enable-pretty-printing",
"ignoreFailures": true
}
]
}
]
}
{
"cmake.buildDirectory": "${workspaceRoot}/../build/${workspaceRootFolderName}",
"cmake.generator": "Ninja",
"cmake.sourceDirectory": "${workspaceRoot}/",
"C_Cpp.default.configurationProvider": "vector-of-bool.cmake-tools",
"editor.formatOnSave": false,
"files.associations": {
"__config": "cpp",
"__nullptr": "cpp"
}
}
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
project(gdw_ss15_cpp) project(gdw_ss15_cpp)
cmake_policy(SET CMP0072 NEW)
################################################################################ ################################################################################
# Libraries # Libraries
...@@ -30,19 +31,25 @@ elseif(WIN32) ...@@ -30,19 +31,25 @@ elseif(WIN32)
endif() endif()
#gli library add_library(glm INTERFACE)
include_directories( target_include_directories(glm INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/lib/gli ${CMAKE_CURRENT_SOURCE_DIR}/lib/glm)
) target_compile_options(glm INTERFACE
add_subdirectory(lib/gli) -Wno-all
-Wno-extra
-Wno-pedantic
#glm library -Wno-error)
include_directories( target_compile_definitions(glm INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/lib/glm GLM_ENABLE_EXPERIMENTAL
) GLM_SWIZZLE)
add_definitions(-DGLM_SWIZZLE) add_library(gli INTERFACE)
add_subdirectory(lib/glm) target_include_directories(gli INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/lib/gli)
target_compile_options(gli INTERFACE
-Wno-all
-Wno-extra
-Wno-pedantic
-Wno-error)
#glew library #glew library
...@@ -167,6 +174,8 @@ set(LINKED_LIBRARIES ...@@ -167,6 +174,8 @@ set(LINKED_LIBRARIES
SDL2main SDL2main
SDL2 SDL2
SDL2_mixer SDL2_mixer
glm
gli
) )
if(UNIX) if(UNIX)
...@@ -191,4 +200,8 @@ add_executable(Game ${project_SRC} ${project_HDR} ${project_INL}) ...@@ -191,4 +200,8 @@ add_executable(Game ${project_SRC} ${project_HDR} ${project_INL})
target_link_libraries(Game ${LINKED_LIBRARIES}) target_link_libraries(Game ${LINKED_LIBRARIES})
#copy assets to the executable destination #copy assets to the executable destination
file(COPY assets DESTINATION .) add_custom_target(assets
${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/assets ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Copying assets")
add_dependencies(Game
assets)
title : Deth Buff Arr title : Deth Buff Arr
borderless : false borderless : false
fullscreen : false fullscreen : true
width : 800 width : 800
height : 600 height : 600
music_volume : 100 music_volume : 100
sound_volume : 100 sound_volume : 100
debug_render : false debug_render : false
shadow_resolution : 256 shadow_resolution : 4096
shadows : true shadows : true
camX : 0 camX : 0
camY : 45 camY : 45
...@@ -17,6 +17,7 @@ victim_mass : 1 ...@@ -17,6 +17,7 @@ victim_mass : 1
map_load_timer : 0 map_load_timer : 0
test_ui : false test_ui : false
mapGenDebug : false mapGenDebug : false
navDebug : false
move_left_key1 : a move_left_key1 : a
move_left_key2 : left move_left_key2 : left
move_left_controller_axis : leftx move_left_controller_axis : leftx
......
...@@ -24,7 +24,7 @@ namespace gdw { ...@@ -24,7 +24,7 @@ namespace gdw {
int sound_volume_; int sound_volume_;
public: public:
audio(engine& engine) noexcept; audio(engine& engine);
~audio(); ~audio();
audio(const audio&) = delete; audio(const audio&) = delete;
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
namespace gdw { namespace gdw {
audio::audio(engine& engine) noexcept audio::audio(engine& engine)
: audio_collection_(engine) { : audio_collection_(engine) {
auto config = engine.config_manager().load("config/settings"); auto config = engine.config_manager().load("config/settings");
if (!config) { if (!config) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment