diff --git a/CMakeLists.txt b/CMakeLists.txt index 3446f79e..60133cc0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ if(MSVC) add_definitions( -DPLATFORM_WINDOWS ) endif() -if (NO_X11 OR FORCE_GBM) +if (NO_X11 OR FORCE_DRM) add_compile_options(-std=c++14 -DGLM_FORCE_CXX14 -fpermissive -Wno-psabi -lpthread) endif() diff --git a/deps/lygia b/deps/lygia index e34ee2fd..b364f4d6 160000 --- a/deps/lygia +++ b/deps/lygia @@ -1 +1 @@ -Subproject commit e34ee2fda3f266fde06f4412d6f6977f62770509 +Subproject commit b364f4d6481450ce4aab9a0dac86ad8dc8089125 diff --git a/deps/vera b/deps/vera index 97f9cb11..a347b81d 160000 --- a/deps/vera +++ b/deps/vera @@ -1 +1 @@ -Subproject commit 97f9cb11af39df95ebe0a92bec508de1c3876e56 +Subproject commit a347b81d6019de0353b455f0479ee25d38ec64dd diff --git a/src/main.cpp b/src/main.cpp index 1800d590..45e810c6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -251,7 +251,7 @@ int main(int argc, char **argv) { else std::cout << "Argument '" << argument << "' should be followed by a . Skipping argument." << std::endl; } - #if defined(DRIVER_GBM) + #if defined(DRIVER_DRM) else if ( argument == "-d" || argument == "-display" || argument == "--display") { if (++i < argc) window_properties.display = std::string(argv[i]); @@ -274,7 +274,7 @@ int main(int argc, char **argv) { std::cout << version << std::endl; } else if ( argument == "-l" || argument == "-life-coding" || argument == "--life-coding" ){ - #if defined(DRIVER_BROADCOM) || defined(DRIVER_GBM) + #if defined(DRIVER_BROADCOM) || defined(DRIVER_DRM) window_properties.screen_x = window_properties.screen_width - 512; window_properties.screen_width = window_properties.screen_height = 512; #else @@ -390,7 +390,7 @@ int main(int argc, char **argv) { argument == "-s" || argument == "-size" || argument == "--size" || argument == "-w" || argument == "-width" || argument == "--width" || argument == "-h" || argument == "-height" || argument == "--height" || - #if defined(DRIVER_GBM) + #if defined(DRIVER_DRM) argument == "-d" || argument == "-display" || argument == "--display" || #endif #if !defined(DRIVER_GLFW) @@ -1994,7 +1994,7 @@ void printUsage(char * executableName) { std::cerr << " -s or --size # set width and height of the window" << std::endl; std::cerr << " -w or --width # set the width of the window" << std::endl; std::cerr << " -h or --height # set the height of the window" << std::endl; -#if defined(DRIVER_GBM) +#if defined(DRIVER_DRM) std::cerr << " -d or --display # open specific display port. Ex: -d /dev/dri/card1" << std::endl; #endif #if !defined(DRIVER_GLFW)