Merge branch 'master' of https://github.com/aiekick/NoodlesPlate

aiekick · Sep 24, 2023 · 95a4100 · 95a4100
2 parents 18763f1 + ac5414e
commit 95a4100
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml
@@ -15,7 +15,7 @@ jobs:
     - name: checkout submodules
       run : git submodule update --init --recursive 
     - name: Install OpenGL lib  / Requirement for Glfw3
-      run : sudo apt-get update && sudo apt-get install libgl1-mesa-dev libx11-dev libxi-dev libxrandr-dev libxinerama-dev libxcursor-dev
+      run : sudo apt-get update && sudo apt-get install libgl1-mesa-dev libx11-dev libxi-dev libxrandr-dev libxinerama-dev libxcursor-dev libasound2-dev
     - name: configure
       run: mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release -DUSE_VR=OFF -DUSE_GPU_METRIC=OFF
     - name: build

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -112,7 +112,7 @@ if(MSVC)
     add_definitions(-DMSVC)
 	add_definitions(-DNOMINMAX) ## for avoid issue regarding std::max and std::min
 else ()
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Wdeprecated-declarations -Wunused-parameter")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Wdeprecated-declarations")
 endif()
 
 if (TARGET uninstall)

diff --git a/src/Headers/CustomImGuiFileDialogConfig.h b/src/Headers/CustomImGuiFileDialogConfig.h
@@ -42,7 +42,7 @@
 //#define MAX_PATH_BUFFER_SIZE 1024
 
 // options of use std::filesystem isntead of dirent.h but need c++17
-#define USE_STD_FILESYSTEM
+//#define USE_STD_FILESYSTEM
 
 #define USE_THUMBNAILS
 //the thumbnail generation use the stb_image and stb_resize lib who need to define the implementation