aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2013-12-04 05:49:31 +0000
committerDimitri Sokolyuk <demon@dim13.org>2013-12-04 05:49:31 +0000
commit8804bc818f6cc4094ce46a247a1dd0a65f471a0d (patch)
tree8a46255dc7c5f2918bed5ad089d1fcc75e35a815
parenta54ee392602c49638650a91abe1f811492cf2aab (diff)
fix double definition, add sdl header for os x support.
-rw-r--r--README4
-rw-r--r--emu.c1
-rw-r--r--main.c1
3 files changed, 3 insertions, 3 deletions
diff --git a/README b/README
index 826c0c8..975ef39 100644
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
DCPU-16 Assembler/Emulator
Main developtment platform is OpenBSD, thus if you wish to compile it
-on Debian you'll need freebsd-buildutils package. Other platforms are
-not tested.
+on Debian you'll need freebsd-buildutils package. Compiles and runs on
+OS X. Other platforms are not tested.
Dependencies:
SDL
diff --git a/emu.c b/emu.c
index afcc646..71d9488 100644
--- a/emu.c
+++ b/emu.c
@@ -413,7 +413,6 @@ void (*op[nOpt])(struct context *, unsigned short *, unsigned short *) = {
[SHR] = shr,
[ASR] = asr,
[SHL] = shl,
- [STI] = sti,
[IFB] = ifb,
[IFC] = ifc,
[IFE] = ife,
diff --git a/main.c b/main.c
index ddd905d..48b577b 100644
--- a/main.c
+++ b/main.c
@@ -15,6 +15,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include <SDL.h>
#include <err.h>
#include <stdio.h>
#include <stdlib.h>