Skip to content

Commit

Permalink
Work in progress
Browse files Browse the repository at this point in the history
  • Loading branch information
skhaz committed Nov 17, 2023
1 parent 69388be commit 352cda9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
run: sudo apt-get install -y libegl-dev libegl1-mesa-dev libva-dev libvdpau-dev libx11-xcb-dev libfontenc-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxfixes-dev libxi-dev libxinerama-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxres-dev libxss-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev libxcb-dri3-dev libxcb-cursor-dev libxcb-util-dev

- name: Install Dependencies
run: conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20 --settings build_type=Release
run: conan install .. --output-folder=. --build="*" --settings compiler.cppstd=17 --settings build_type=Release
working-directory: build

- name: Lint
Expand Down
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ file(GLOB SOURCE_FILES "src/*.cpp")
add_executable(${PROJECT_NAME} ${SOURCE_FILES})
target_precompile_headers(${PROJECT_NAME} PRIVATE ${HEADER_FILES})

option(SANDBOX "Use sandbox" OFF)

if(SANDBOX)
add_definitions(-DSANDBOX)
endif()

if (CMAKE_BUILD_TYPE MATCHES "Debug")
if (MSVC)
target_compile_options(${PROJECT_NAME} PRIVATE /W4 /Od /Zi)
Expand Down
4 changes: 4 additions & 0 deletions src/application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ application::application(int argc, char **argv) {

int application::run() {

Check warning on line 22 in src/application.cpp

View workflow job for this annotation

GitHub Actions / lint

/src/application.cpp:22:18 [modernize-use-trailing-return-type]

use a trailing return type for this function

Check warning on line 22 in src/application.cpp

View workflow job for this annotation

GitHub Actions / lint

/src/application.cpp:22:18 [readability-convert-member-functions-to-static]

method 'run' can be made static
try {
#if SANDBOX
filesystem::mount("../assets/sandbox", "/");
#else
filesystem::mount("bundle.7z", "/");
#endif

auto se = scriptengine();
se.run();
Expand Down

0 comments on commit 352cda9

Please sign in to comment.