summaryrefslogtreecommitdiff
path: root/plugins/dfinput
diff options
context:
space:
mode:
authoriCatButler <i.am.catbutler@gmail.com>2018-04-27 12:18:49 +0100
committerGitHub <noreply@github.com>2018-04-27 12:18:49 +0100
commit7936d466c58f6f2603900fbbc9d18b56ac2e4b4c (patch)
tree714d9f371901f7083cf38fc547d46df32d16f16e /plugins/dfinput
parent6f76041029393c6823973a29426b28c8c2d0b064 (diff)
parent5687e9684cccc74e9dfa040c59a04d61e0851d54 (diff)
downloadpcsxr-7936d466c58f6f2603900fbbc9d18b56ac2e4b4c.tar.gz
Merge pull request #8 from loathingKernel/travis
Add Travis CI support for Linux and OS X
Diffstat (limited to 'plugins/dfinput')
-rw-r--r--plugins/dfinput/CMakeLists.txt3
-rw-r--r--[-rwxr-xr-x]plugins/dfinput/analog.c0
-rw-r--r--[-rwxr-xr-x]plugins/dfinput/cfg-gtk.c0
-rw-r--r--[-rwxr-xr-x]plugins/dfinput/cfg.c0
-rw-r--r--[-rwxr-xr-x]plugins/dfinput/pad.c0
-rw-r--r--[-rwxr-xr-x]plugins/dfinput/pad.h0
-rw-r--r--[-rwxr-xr-x]plugins/dfinput/sdljoy.c0
-rw-r--r--[-rwxr-xr-x]plugins/dfinput/util.c0
-rw-r--r--[-rwxr-xr-x]plugins/dfinput/util.h0
-rw-r--r--[-rwxr-xr-x]plugins/dfinput/xkb.c0
10 files changed, 1 insertions, 2 deletions
diff --git a/plugins/dfinput/CMakeLists.txt b/plugins/dfinput/CMakeLists.txt
index 4899b85c..5859c116 100644
--- a/plugins/dfinput/CMakeLists.txt
+++ b/plugins/dfinput/CMakeLists.txt
@@ -1,9 +1,8 @@
-message(STATUS "* Configuring dfinput")
+message(STATUS "* Configuring DFInput")
include(GlibCompileResourcesSupport)
#deps
-
find_package(GLib REQUIRED)
if(NOT GLib_FOUND)
message(FATAL_ERROR "GLIB2 library not found")
diff --git a/plugins/dfinput/analog.c b/plugins/dfinput/analog.c
index ea89ab13..ea89ab13 100755..100644
--- a/plugins/dfinput/analog.c
+++ b/plugins/dfinput/analog.c
diff --git a/plugins/dfinput/cfg-gtk.c b/plugins/dfinput/cfg-gtk.c
index bcc733d1..bcc733d1 100755..100644
--- a/plugins/dfinput/cfg-gtk.c
+++ b/plugins/dfinput/cfg-gtk.c
diff --git a/plugins/dfinput/cfg.c b/plugins/dfinput/cfg.c
index 622c3c34..622c3c34 100755..100644
--- a/plugins/dfinput/cfg.c
+++ b/plugins/dfinput/cfg.c
diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c
index f413d0a4..f413d0a4 100755..100644
--- a/plugins/dfinput/pad.c
+++ b/plugins/dfinput/pad.c
diff --git a/plugins/dfinput/pad.h b/plugins/dfinput/pad.h
index 3051e6ad..3051e6ad 100755..100644
--- a/plugins/dfinput/pad.h
+++ b/plugins/dfinput/pad.h
diff --git a/plugins/dfinput/sdljoy.c b/plugins/dfinput/sdljoy.c
index 3e8cc993..3e8cc993 100755..100644
--- a/plugins/dfinput/sdljoy.c
+++ b/plugins/dfinput/sdljoy.c
diff --git a/plugins/dfinput/util.c b/plugins/dfinput/util.c
index 11bc408c..11bc408c 100755..100644
--- a/plugins/dfinput/util.c
+++ b/plugins/dfinput/util.c
diff --git a/plugins/dfinput/util.h b/plugins/dfinput/util.h
index 29cbf4d9..29cbf4d9 100755..100644
--- a/plugins/dfinput/util.h
+++ b/plugins/dfinput/util.h
diff --git a/plugins/dfinput/xkb.c b/plugins/dfinput/xkb.c
index 47eac669..47eac669 100755..100644
--- a/plugins/dfinput/xkb.c
+++ b/plugins/dfinput/xkb.c