diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index d57e723..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -cmake_minimum_required(VERSION 3.29.6) - -set(CMAKE_CXX_COMPILER clang++) -set(CMAKE_CXX_STANDARD 20) -set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") - -project(HelloWorld CXX) - -find_package(fmt CONFIG REQUIRED) -find_package(glfw3 CONFIG REQUIRED) -find_package(OpenGL REQUIRED) - -add_executable(main src/main.cpp) - -target_link_libraries(main PRIVATE fmt::fmt glfw OpenGL) diff --git a/README.md b/README.md new file mode 100644 index 0000000..1e9f667 --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +# Wayland Application + +### Setup + +```shell +mason setup build +``` + +### Build + +```shell +mason compile +``` diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..46f3e7b --- /dev/null +++ b/meson.build @@ -0,0 +1,9 @@ + +project('test', 'cpp') + +deps = [] +deps += dependency('fmt') +deps += dependency('glfw3') +deps += dependency('gl') + +executable('main', 'src/main.cpp', dependencies : deps) diff --git a/shell.nix b/shell.nix index e314eef..e445fbe 100644 --- a/shell.nix +++ b/shell.nix @@ -6,23 +6,20 @@ pkgs.llvmPackages.stdenv.mkDerivation { name = "Development"; buildInputs = with pkgs.buildPackages; [ fmt + fmt.dev glfw-wayland libGL libGL.dev ]; # nativeBuildInputs is usually what you want -- tools you need to run nativeBuildInputs = with pkgs.buildPackages; [ + meson + ninja gnumake - cmake - vcpkg clang clang-tools pkg-config ]; - shellHook = '' - export VCPKG_ROOT="${pkgs.vcpkg.outPath}/share/vcpkg"; - # export CC="${pkgs.clang.outPath}/bin/clang"; - # export CXX="${pkgs.clang.outPath}/bin/clang++"; - ''; + shellHook = ''''; }