Merge pull request #43 from spicyjpeg/cmake

Even more CMake fixes, submodules, pads example

3 files changed, 5 insertions, 2 deletions

diff --git a/indev/README.md b/indev/README.md
index 2064a36..8263487 100644
--- a/indev/README.md
+++ b/indev/README.md
@@ -23,6 +23,10 @@ also go into this directory.
   The Github release of this work-in-progress component includes delay

   corrections for PAL consoles.

 

+  **NOTE**: the `io/pads` example also shows how to poll controllers manually

+  in a slightly different way (using a timer), and includes a reusable

+  low-level pad driver.

+

 Work-in-progress components such as psxcd, interlace-exp, xptest and partest

 are not included, as the former was completed while the remaining latter are

 merely scrap test programs.
\ No newline at end of file
diff --git a/indev/psxmdec/main.c b/indev/psxmdec/main.c
index c9fd678..f4f0f51 100644
--- a/indev/psxmdec/main.c
+++ b/indev/psxmdec/main.c
@@ -1,7 +1,7 @@
 #include <sys/types.h>

 #include <stdio.h>

 #include <string.h>

-#include <malloc.h>

+#include <stdlib.h>

 #include <psxgte.h>

 #include <psxgpu.h>

 

diff --git a/indev/psxpad/main.c b/indev/psxpad/main.c
index e8a6181..afd801e 100644
--- a/indev/psxpad/main.c
+++ b/indev/psxpad/main.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <malloc.h>
 #include <psxetc.h>
 #include <psxgte.h>
 #include <psxgpu.h>