diff options
Diffstat (limited to 'proto-vjoy')
| -rw-r--r-- | proto-vjoy/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | proto-vjoy/ftnoir_protocol_vjoy.h | 9 | ||||
| -rw-r--r-- | proto-vjoy/ftnoir_vjoy_controls.ui | 10 |
3 files changed, 26 insertions, 14 deletions
diff --git a/proto-vjoy/CMakeLists.txt b/proto-vjoy/CMakeLists.txt index 5584c876..1c4f7fb9 100644 --- a/proto-vjoy/CMakeLists.txt +++ b/proto-vjoy/CMakeLists.txt @@ -1,18 +1,23 @@ if(WIN32) set(SDK_VJOY "" CACHE PATH "VJoy SDK path") if(SDK_VJOY) - set(link "") + if(opentrack-64bit) + set(arch 64) + else() + set(arch 32) + endif() + set(lib ${SDK_VJOY}/VJoy${arch}.dll) + if (MSVC) + set(implib "${SDK_VJOY}/VJoy${arch}.lib") + else() + set(implib "${lib}") + endif() if(CMAKE_COMPILER_IS_GNUCXX) set(link "-Wl,--enable-stdcall-fixup") endif() opentrack_boilerplate(opentrack-proto-vjoy LINK "${link}") - if(MSVC) - set(ext .lib) - else() - set(ext .dll) - endif() - target_link_libraries(opentrack-proto-vjoy ${MY_QT_LIBS} ${SDK_VJOY}/VJoy${ext}) + target_link_libraries(opentrack-proto-vjoy "${implib}") target_include_directories(opentrack-proto-vjoy SYSTEM PUBLIC ${SDK_VJOY}) - install(FILES "${SDK_VJOY}/VJoy.dll" DESTINATION . ${opentrack-perms}) + install(FILES "${lib}" DESTINATION . RENAME "VJoy.dll") endif() endif() diff --git a/proto-vjoy/ftnoir_protocol_vjoy.h b/proto-vjoy/ftnoir_protocol_vjoy.h index 118306b5..949eeb92 100644 --- a/proto-vjoy/ftnoir_protocol_vjoy.h +++ b/proto-vjoy/ftnoir_protocol_vjoy.h @@ -79,12 +79,13 @@ typedef struct _JOYSTICK_STATE UINT32 Buttons; // 32 Buttons } JOYSTICK_STATE, * PJOYSTICK_STATE; +#define VJOY_API extern "C" __declspec(dllimport) + #ifndef _MSC_VER -EXTERN_C BOOL __stdcall VJoy_Initialize(PCHAR name, PCHAR serial); -EXTERN_C VOID __stdcall VJoy_Shutdown(); -EXTERN_C BOOL __stdcall VJoy_UpdateJoyState(int id, PJOYSTICK_STATE pJoyState); +VJOY_API BOOL __stdcall VJoy_Initialize(PCHAR name, PCHAR serial); +VJOY_API VOID __stdcall VJoy_Shutdown(); +VJOY_API BOOL __stdcall VJoy_UpdateJoyState(int id, PJOYSTICK_STATE pJoyState); #else -#define VJOY_API __declspec(dllimport) VJOY_API BOOL __stdcall VJoy_Initialize(PCHAR name, PCHAR serial); VJOY_API VOID __stdcall VJoy_Shutdown(); VJOY_API BOOL __stdcall VJoy_UpdateJoyState(int id, PJOYSTICK_STATE pJoyState); diff --git a/proto-vjoy/ftnoir_vjoy_controls.ui b/proto-vjoy/ftnoir_vjoy_controls.ui index 2214b887..aa465b5c 100644 --- a/proto-vjoy/ftnoir_vjoy_controls.ui +++ b/proto-vjoy/ftnoir_vjoy_controls.ui @@ -9,7 +9,7 @@ <rect> <x>0</x> <y>0</y> - <width>228</width> + <width>280</width> <height>69</height> </rect> </property> @@ -30,7 +30,13 @@ <item> <widget class="QLabel" name="label"> <property name="text"> - <string>No settings necessary</string> + <string><html><head/><body><p>Go to <a href="http://headsoft.com.au/index.php?category=vjoy"><span style=" text-decoration: underline; color:#0000ff;">Headsoft's site</span></a> for driver download first.</p></body></html></string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + <property name="openExternalLinks"> + <bool>true</bool> </property> </widget> </item> |