Release v0.3.0-beta2

workflow: use cmake

Author: Toni500github

.github/workflows/release.yml

@@ -55,6 +55,7 @@ jobs:
             build-essential \
             pkg-config \
             make \
+            cmake \
             git \
             zip \
             fuse \
@@ -98,10 +99,10 @@ jobs:
             libcurl-devel
             mingw-w64-x86_64-7zip
             mingw-w64-x86_64-directx-headers
-            mingw-w64-x86_64-ncurses
+            mingw-w64-x86_64-make
             mingw-w64-x86_64-toolchain
             mingw-w64-x86_64-minizip
-            mingw-w64-x86_64-gcc
+            mingw-w64-x86_64-cmake
             mingw-w64-x86_64-zbar
             mingw-w64-x86_64-make
             mingw-w64-x86_64-tesseract-ocr
@@ -116,19 +117,25 @@ jobs:
       - name: Build project (Linux)
         if: matrix.os != 'windows-latest'
         run: |
-          make all DEBUG=0 LDFLAGS="-Wl,--as-needed"
+          #make all DEBUG=0 LDFLAGS="-Wl,--as-needed"
+          mkdir -p build
+          cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
+          cd build && make
 
       - name: Build project (Windows)
         if: matrix.os == 'windows-latest'
         shell: msys2 {0}
         run: |
-          mingw32-make all DEBUG=0
+          #mingw32-make all DEBUG=0 WINDOWS_CMD=0
+          mkdir -p build
+          cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWINDOWS_CMD=OFF
+          cd build && make
 
       - name: Prepare Linux package
         if: matrix.os == 'ubuntu-latest'
         run: |
           mkdir -p package/oshot
-          cp ./build/release/oshot ./launcher/oshot_launcher.py package/oshot/
+          cp ./build/oshot ./launcher/oshot_launcher.py package/oshot/
           echo "#!/bin/bash" > package/oshot/install.sh
           echo "cp oshot /usr/local/bin/oshot" >> package/oshot/install.sh
           echo "cp oshot_launcher.py /usr/local/bin/oshot_launcher" >> package/oshot/install.sh
@@ -140,7 +147,7 @@ jobs:
         if: matrix.os == 'ubuntu-22.04'
         run: |
           mkdir -p package/oshot
-          ./scripts/create_appimage.sh ./build/release/oshot oshot-x86_64.AppImage
+          ./scripts/create_appimage.sh ./build/oshot oshot-x86_64.AppImage
           chmod +x oshot-x86_64.AppImage
           mv oshot-x86_64.AppImage package/oshot/
           cp ./launcher/oshot_launcher.py package/oshot/
@@ -153,7 +160,7 @@ jobs:
         run: |
           mkdir -p package/oshot
           sed -i 's|#!/bin/env python3|#!python|' launcher/oshot_launcher.py
-          cp ./build/release/oshot.exe package/oshot/
+          cp ./build/oshot.exe package/oshot/
           cp ./launcher/oshot_launcher.py package/oshot/oshot_launcher.pyw
           # Copy required DLLs
           ldd ./build/release/oshot.exe | grep -i mingw | awk '{print $3}' | xargs -I {} cp {} package/oshot/ || true

CMakeLists.txt

@@ -94,12 +94,10 @@ add_custom_target(
 )
 add_dependencies(${PROJECT_NAME} genver)
 
-target_include_directories(
-    ${PROJECT_NAME}
-    PRIVATE
-        ${CMAKE_SOURCE_DIR}/include
-        ${CMAKE_SOURCE_DIR}/include/libs
-        ${CMAKE_SOURCE_DIR}/include/libs/imgui
+include_directories(
+        include
+        include/libs
+        include/libs/imgui
 )
 
 target_compile_options(

Makefile

@@ -5,7 +5,7 @@ VARS  	  	?=
 CXXSTD		?= c++20
 
 DEBUG 		?= 0
-WINDOWS_CMD	?= 1
+WINDOWS_CMD	?= 0
 ENABLE_PORTALS	?= 1
 
 COMPILER := $(shell $(CXX) --version | head -n1)