diff options
| author | Jacob Palecki <[email protected]> | 2020-08-03 13:21:20 -0700 |
|---|---|---|
| committer | Jacob Palecki <[email protected]> | 2020-08-03 13:21:20 -0700 |
| commit | e13fe36fc04eb01bdc21cf90378d3c7c03d26a55 (patch) | |
| tree | 6b7b9b28ed970609dbeaff32352ec909dfcda98c /wrapper | |
| parent | Add tool menu to enable\disable charts (diff) | |
| parent | Merge pull request #8 from a1xd/read (diff) | |
| download | rawaccel-e13fe36fc04eb01bdc21cf90378d3c7c03d26a55.tar.xz rawaccel-e13fe36fc04eb01bdc21cf90378d3c7c03d26a55.zip | |
Merge branch 'master' into GUI
Diffstat (limited to 'wrapper')
| -rw-r--r-- | wrapper/wrapper.cpp | 1 | ||||
| -rw-r--r-- | wrapper/wrapper.hpp | 14 | ||||
| -rw-r--r-- | wrapper/wrapper.vcxproj | 1 | ||||
| -rw-r--r-- | wrapper/wrapper_writer.cpp | 4 | ||||
| -rw-r--r-- | wrapper/wrapper_writer.hpp | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp index ceee1a1..bd0574f 100644 --- a/wrapper/wrapper.cpp +++ b/wrapper/wrapper.cpp @@ -1,6 +1,7 @@ #pragma once #include "wrapper.hpp" + using namespace rawaccel; using namespace System; diff --git a/wrapper/wrapper.hpp b/wrapper/wrapper.hpp index 870aca7..e8f100d 100644 --- a/wrapper/wrapper.hpp +++ b/wrapper/wrapper.hpp @@ -1,16 +1,14 @@ #pragma once -#include "wrapper_writer.hpp" -#include "..\common\rawaccel.hpp"; -#include "..\common\accel-error.hpp"; #include <iostream> -using namespace rawaccel; -using namespace System; +#include <rawaccel.hpp> +#include <accel-error.hpp> -public value struct ArgsWrapper { - int a; -}; +#include "wrapper_writer.hpp" + +using namespace rawaccel; +using namespace System; public ref class ManagedAccel { diff --git a/wrapper/wrapper.vcxproj b/wrapper/wrapper.vcxproj index 28acbe7..bffbf8b 100644 --- a/wrapper/wrapper.vcxproj +++ b/wrapper/wrapper.vcxproj @@ -59,6 +59,7 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> + <Import Project="..\common\common.vcxitems" Label="Shared" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> diff --git a/wrapper/wrapper_writer.cpp b/wrapper/wrapper_writer.cpp index 0a74105..da7c9bf 100644 --- a/wrapper/wrapper_writer.cpp +++ b/wrapper/wrapper_writer.cpp @@ -1,9 +1,9 @@ #pragma once -#include "..\console\console_write.cpp" +#include <rawaccel-io.hpp> #include "wrapper_writer.hpp" void writer::writeToDriver(rawaccel::mouse_modifier* modifier) { - write(*modifier); + rawaccel::write(*modifier); } diff --git a/wrapper/wrapper_writer.hpp b/wrapper/wrapper_writer.hpp index 591f62f..dcbef10 100644 --- a/wrapper/wrapper_writer.hpp +++ b/wrapper/wrapper_writer.hpp @@ -1,6 +1,6 @@ #pragma once -#include "..\common\rawaccel.hpp" +#include <rawaccel.hpp> struct writer { void writeToDriver(rawaccel::mouse_modifier* modifier); |