Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lilypad, xpad: Remove DirectX SDK dependency, support both XInput 1.3 and 1.4 #1237

Merged
merged 4 commits into from
Mar 28, 2016
Merged

lilypad, xpad: Remove DirectX SDK dependency, support both XInput 1.3 and 1.4 #1237

merged 4 commits into from
Mar 28, 2016

Conversation

turtleli
Copy link
Member

Changes:

  • Removes DirectX SDK dependency from Lilypad and xpad
  • Allow Windows 8 and above to use XInput 1.4 if the DirectX redists aren't installed. If the XInput 1.3 dll is present, it'll choose to use that first - I think SCP only has an XInput 1.3 wrapper at the moment.

@turtleli turtleli mentioned this pull request Mar 20, 2016
Merged
@turtleli turtleli merged commit 587c0ea into PCSX2:master Mar 28, 2016
@turtleli turtleli deleted the xinput branch March 28, 2016 08:47
mirh
mirh reviewed Mar 31, 2016
View reviewed changes
plugins/xpad/xpad.cpp
@@ -23,6 +23,10 @@
#include "xpad.h"
#include <VersionHelpers.h>

#undef _WIN32_WINNT
#define _WIN32_WINNT 0x0602 // Required for XInputEnable definition

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@mirh mirh mentioned this pull request Apr 1, 2016
Merged
mirh referenced this pull request Apr 3, 2016
@turtleli
Merge pull request #1238 from turtleli/gsdx-use-windows-sdk
16ef7ca 
gsdx: Remove DirectX SDK dependency
@turtleli turtleli added this to the Release 1.6 milestone Jun 17, 2016
@mirh mirh mentioned this pull request Jun 27, 2016
Open
@turtleli turtleli mentioned this pull request Apr 11, 2017
Merged
@mirh mirh mentioned this pull request Apr 27, 2020
Closed
blueclouds8666 added a commit to blueclouds8666/pcsx2_XP that referenced this pull request Oct 12, 2020
@blueclouds8666
Revert "Merge pull request PCSX2#1237 from turtleli/xinput"
1d57103 
This reverts commit 587c0ea, reversing
changes made to a99750a.

# Conflicts:
#	plugins/LilyPad/LilyPad.vcxproj
#	plugins/LilyPad/XInputEnum.cpp
#	plugins/xpad/xpad.cpp
blueclouds8666 added a commit to blueclouds8666/pcsx2_XP that referenced this pull request Oct 12, 2020
@blueclouds8666
Revert "Merge pull request PCSX2#1237 from turtleli/xinput"
31bea86 
This reverts commit 587c0ea, reversing
changes made to a99750a.

# Conflicts:
#	plugins/LilyPad/LilyPad.vcxproj
#	plugins/LilyPad/XInputEnum.cpp
#	plugins/xpad/stdafx.h
#	plugins/xpad/vsprops/common.props
#	plugins/xpad/xpad.cpp
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Build | Project System OS: Windows
Projects
None yet
Milestone
Release 1.6
Development

Successfully merging this pull request may close these issues.
2 participants
@turtleli @mirh