Browse Source

naming: initial switch to pine

new-name
parent
commit
d5270b5abb
Signed by: govanify GPG Key ID: DE62E1E2A6145556
12 changed files with 24 additions and 59 deletions
  1. +6
    -6
      README.md
  2. +2
    -2
      bindings/c/meson.build
  3. +3
    -3
      bindings/csharp/Program.cs
  4. +1
    -1
      bindings/lua/example.lua
  5. +4
    -4
      bindings/python/example.py
  6. +1
    -1
      bindings/rust/src/main.rs
  7. +2
    -2
      gcovr.cfg
  8. +2
    -2
      meson.build
  9. +1
    -1
      src/client.cpp
  10. +0
    -0
      src/pine.h
  11. +2
    -2
      src/tests.cpp
  12. +0
    -35
      windows-qt.pro

+ 6
- 6
README.md View File

@ -1,12 +1,12 @@
PCSX2 IPC Client-Side Reference API
======
[![build](https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.govanify.com%2Fjob%2Fgovanify%2Fjob%2Fpcsx2_ipc%2Fjob%2Fmaster)
![tests](https://img.shields.io/jenkins/tests?compact_message&jobUrl=https%3A%2F%2Fci.govanify.com%2Fjob%2Fgovanify%2Fjob%2Fpcsx2_ipc%2Fjob%2Fmaster%2F)
![coverage](https://img.shields.io/jenkins/coverage/api?jobUrl=https%3A%2F%2Fci.govanify.com%2Fjob%2Fgovanify%2Fjob%2Fpcsx2_ipc%2Fjob%2Fmaster%2F)
](https://ci.govanify.com/blue/organizations/jenkins/govanify%2Fpcsx2_ipc/activity?branch=master)
[![build](https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.govanify.com%2Fjob%2Fgovanify%2Fjob%2Fpine%2Fjob%2Fmaster)
![tests](https://img.shields.io/jenkins/tests?compact_message&jobUrl=https%3A%2F%2Fci.govanify.com%2Fjob%2Fgovanify%2Fjob%2Fpine%2Fjob%2Fmaster%2F)
![coverage](https://img.shields.io/jenkins/coverage/api?jobUrl=https%3A%2F%2Fci.govanify.com%2Fjob%2Fgovanify%2Fjob%2Fpine%2Fjob%2Fmaster%2F)
](https://ci.govanify.com/blue/organizations/jenkins/govanify%2Fpine/activity?branch=master)
You'll find [here](https://code.govanify.com/govanify/pcsx2_ipc/)
You'll find [here](https://code.govanify.com/govanify/pine/)
the reference implementation of PCSX2 IPC Socket client-side C++ API, along with
different language bindings and examples.
@ -24,7 +24,7 @@ if you really want to use another generator, say, Visual Studio, instead of ninj
Alternatively, loading the "windows-qt.pro" on Windows with Qt Creator will work just fine if you're lazy.
If you dislike C++
[bindings in popular languages are
available](https://code.govanify.com/govanify/pcsx2_ipc/src/branch/master/bindings/).
available](https://code.govanify.com/govanify/pine/src/branch/master/bindings/).
On Doxygen you can find the documentation of the C++ API [here](@ref PCSX2Ipc).
The C API is documented [here](@ref bindings/c/c_ffi.h) and is probably what you


+ 2
- 2
bindings/c/meson.build View File

@ -1,4 +1,4 @@
project('pcsx2_ipc', 'cpp', default_options : ['cpp_std=c++17',
project('pine', 'cpp', default_options : ['cpp_std=c++17',
'buildtype=release'])
add_global_arguments('-DC_FFI', language : 'cpp')
@ -7,7 +7,7 @@ compiler = meson.get_compiler('cpp')
winsock = compiler.find_library('ws2_32', required: false)
thread_dep = dependency('threads')
src = ['c_ffi.cpp', 'c_ffi.h']
library('pcsx2_ipc_c', src, dependencies : [thread_dep, winsock],
library('pine_cpp', src, dependencies : [thread_dep, winsock],
include_directories : incdir)
cleaner = find_program('clang-format', required : false)


+ 3
- 3
bindings/csharp/Program.cs View File

@ -6,11 +6,11 @@ namespace csharp
class Program
{
#if _WINDOWS
const string libipc = "libpcsx2_ipc_c.dll";
const string libipc = "libpine_c.dll";
#elif _OSX
const string libipc = "libpcsx2_ipc_c.dylib";
const string libipc = "libpine_c.dylib";
#elif _UNIX
const string libipc = "libpcsx2_ipc_c.so";
const string libipc = "libpine_c.so";
#endif
// if the function you want to use isn't there you'll have to define the binding to the function


+ 1
- 1
bindings/lua/example.lua View File

@ -1,6 +1,6 @@
local ffi = require("ffi")
local C = ffi.load('pcsx2_ipc_c')
local C = ffi.load('pine_c')
-- If you need more functions than that you need to copy paste the C bindings,
-- replace struct pointers by void pointers and change enums to their underlying


+ 4
- 4
bindings/python/example.py View File

@ -4,14 +4,14 @@ import platform
# we get the correct library extension per os
lib="libpcsx2_ipc_c"
lib="libpine_c"
cur_os = platform.system()
if(cur_os == "Linux"):
lib="libpcsx2_ipc_c.so"
lib="libpine_c.so"
elif(cur_os == "Windows"):
lib="libpcsx2_ipc_c.dll"
lib="libpine_c.dll"
elif(cur_os == "Darwin"):
lib="libpcsx2_ipc_c.dylib"
lib="libpine_c.dylib"
# we load the library, this will require it to be in the same folder


+ 1
- 1
bindings/rust/src/main.rs View File

@ -3,7 +3,7 @@ use libc::{c_char, c_uint, c_ulong};
#[repr(C)] pub struct PCSX2Ipc { _private: [u8; 0] }
#[link(name = "pcsx2_ipc_c")]
#[link(name = "pine_c")]
extern "C" {
/* I defined the functions I wanted to use for the example
* below but if you need other ones you'll have to


+ 2
- 2
gcovr.cfg View File

@ -1,3 +1,3 @@
# only allow the actual code to have coverage
filter = ../src/pcsx2_ipc.h
filter = src/pcsx2_ipc.h
filter = ../src/pine.h
filter = src/pine.h

+ 2
- 2
meson.build View File

@ -1,10 +1,10 @@
project('pcsx2_ipc_c', 'cpp', default_options : ['cpp_std=c++17',
project('pine_c', 'cpp', default_options : ['cpp_std=c++17',
'buildtype=release'])
compiler = meson.get_compiler('cpp')
winsock = compiler.find_library('ws2_32', required: false)
thread_dep = dependency('threads')
src = ['src/client.cpp', 'src/pcsx2_ipc.h']
src = ['src/client.cpp', 'src/pine.h']
executable('client', src, dependencies : [thread_dep, winsock])


+ 1
- 1
src/client.cpp View File

@ -1,4 +1,4 @@
#include "pcsx2_ipc.h"
#include "pine.h"
#include <iostream>
#include <ostream>
#include <stdio.h>


src/pcsx2_ipc.h → src/pine.h View File


+ 2
- 2
src/tests.cpp View File

@ -1,4 +1,4 @@
#include "pcsx2_ipc.h"
#include "pine.h"
#define CATCH_CONFIG_MAIN
#include <catch2/catch.hpp>
#include <climits>
@ -43,7 +43,7 @@ auto kill_pcsx2() -> int { return system("pkill PCSX2"); }
#endif
SCENARIO("PCSX2 can be interacted with remotely through IPC", "[pcsx2_ipc]") {
SCENARIO("PCSX2 can be interacted with remotely through IPC", "[pine]") {
// ensure we have a clean environment
kill_pcsx2();


+ 0
- 35
windows-qt.pro View File

@ -1,35 +0,0 @@
QT -= gui
CONFIG += c++17 console optimize_full
# remove possible other optimization flags
QMAKE_CXXFLAGS_RELEASE -= -O
QMAKE_CXXFLAGS_RELEASE -= -O1
QMAKE_CXXFLAGS_RELEASE -= -O2
# add the desired -O3 if not present
QMAKE_CXXFLAGS_RELEASE *= -O3
# The following define makes your compiler emit warnings if you use
# any Qt feature that has been marked deprecated (the exact warnings
# depend on your compiler). Please consult the documentation of the
# deprecated API in order to know how to port your code away from it.
DEFINES += QT_DEPRECATED_WARNINGS
# You can also make your code fail to compile if it uses deprecated APIs.
# In order to do so, uncomment the following line.
# You can also select to disable deprecated APIs only up to a certain version of Qt.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
SOURCES += \
src/client.cpp
HEADERS += \
src/pcsx2_ipc.h
LIBS += -lws2_32
# Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target

Loading…
Cancel
Save