Merge pull request #168 from OpenBrickProtocolFoundation/pkg-config-v…

…ariables

add more variables to pkg-config file

.github/workflows/meson.yml → .github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Meson CI
+name: Build CI
 
 on:
   push:

.github/workflows/installer.yml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  installer:
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}-${{ matrix.config.os-version }}
 

.github/workflows/nintendo.yml

@@ -7,7 +7,7 @@ on:
     workflow_dispatch:
 
 jobs:
-    build:
+    nintendo-build:
         name: Nintendo ${{ matrix.config.name }} CI
         runs-on: ubuntu-24.04
         container:

.github/workflows/test.yml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  test:
     name: Run Tests 
     runs-on: ubuntu-24.04
     steps:

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "wrapper/haskell"]
 	path = wrapper/haskell
 	url = https://github.com/Totto16/oopetris_wrapper_haskell.git
+[submodule "wrapper/python"]
+	path = wrapper/python
+	url = https://github.com/Totto16/oopetris_wrapper_python.git

src/libs/core/meson.build

@@ -22,18 +22,10 @@ liboopetris_core = library(
     install: true,
 )
 
-## remove '-stdlib=libc++' from the list, if it's present
-core_dep_compile_args = []
-foreach value : core_lib.get('compile_args')
-    if value != '-stdlib=libc++'
-        core_dep_compile_args += value
-    endif
-endforeach
-
 liboopetris_core_dep = declare_dependency(
     link_with: liboopetris_core,
     include_directories: core_lib.get('inc_dirs'),
-    compile_args: core_dep_compile_args,
+    compile_args: core_lib.get('compile_args'),
     dependencies: core_lib.get('deps'),
     version: meson.project_version(),
 )
@@ -45,6 +37,14 @@ install_headers(
     preserve_path: true,
 )
 
+## remove '-stdlib=libc++' from the list, if it's present
+core_dep_compile_args = []
+foreach value : core_lib.get('compile_args')
+    if value != '-stdlib=libc++'
+        core_dep_compile_args += value
+    endif
+endforeach
+
 # generate pkgconfig files
 pkg = import('pkgconfig')
 
@@ -54,7 +54,8 @@ pkg.generate(
     name: 'oopetris-core',
     filebase: 'oopetris-core',
     subdirs: 'oopetris',
-    extra_cflags: core_lib.get('compile_args'),
+    extra_cflags: core_dep_compile_args,
+    variables: ['compiler=' + pkg_cpp_compiler, 'cpp_stdlib=' + pkg_cpp_stdlib],
 )
 
 # setting this to strings, so += {...} gets detected as an error, if it is done after that

src/libs/meson.build

@@ -4,6 +4,12 @@ core_lib += {
     'inc_dirs': [core_lib.get('inc_dirs'), include_directories('.')],
 }
 
+pkg_cpp_compiler = cpp.get_id()
+pkg_cpp_stdlib = 'unknown'
+if cpp.get_id() == 'clang'
+    pkg_cpp_stdlib = build_with_libcpp ? 'libc++' : 'libstdc++'
+endif
+
 subdir('core')
 
 recordings_lib += {

src/libs/recordings/meson.build

@@ -49,6 +49,7 @@ pkg.generate(
     filebase: 'oopetris-recordings',
     subdirs: 'oopetris',
     extra_cflags: recordings_lib.get('compile_args'),
+    variables: ['compiler=' + pkg_cpp_compiler, 'cpp_stdlib=' + pkg_cpp_stdlib],
 )
 
 # setting this to strings, so += {...} gets detected as an error, if it is done after that

wrapper/README.md

@@ -2,7 +2,7 @@
 
 ## What is this
 
-This are wrappers of some OOPEtris functionaility in other languages.
+This are wrappers of some OOPetris functionaility in other languages.
 They are all in submodules alias in a seperate git repo.
 
 They currently wrap this:
@@ -18,11 +18,12 @@ Current:
 - Node.js (C++ binding)
 - C (C++ binding)
 - Haskell (C binding)
+- Python (C++ binding)
 
 Planned:
-- Python
 - Lua
 - Java
+- Rust
 
 ## Other