Skip to content

Commit

Permalink
Merge pull request #18 from danirod/release/0.1.2
Browse files Browse the repository at this point in the history
Releasing v0.1.2
  • Loading branch information
danirod committed Mar 24, 2016
2 parents 1a45957 + 4348a6d commit f521653
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 10 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2016-03-24 Dani Rodríguez <danirod@outlook.com>

* src/sdl.h: fixed SDL.h header file inclusion.

2016-03-02 Dani Rodríguez <danirod@outlook.com>

* src/cpu.c: fix failing opcodes.
Expand Down
5 changes: 5 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ Copyright (C) 2015-2016 Dani Rodríguez <danirod@outlook.com>
This file is about relevant changes for CHIP-8 users. Developers: Check
ChangeLog for an overview on relevant changes about the source code.

Version 0.1.2 - 2016-03-24
* Added sound support.
* Added more flags: --version and --usage.
* Fixed a few bugs on some opcodes.

Version 0.1.1 - 2015-03-12
* Emulator doesn't crash now on exit on Linux and MacOS X (issue #3)
* Emulator now uses the default system graphics backend. For example, might
Expand Down
5 changes: 2 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# configure.ac

AC_INIT([chip8], [0.1.1], [danirod@outlook.com])
AC_INIT([chip8], [0.1.2], [danirod@outlook.com])
AM_INIT_AUTOMAKE([foreign -Wall -Werror])

# Check programs
Expand All @@ -9,14 +9,13 @@ AC_PROG_CC
AC_PROG_RANLIB

# Check libraries
AC_CHECK_LIB([SDL2], [SDL_Init], [],
[AC_MSG_ERROR(["** ERROR: SDL2 is required to build this. ** "])])
AC_CHECK_LIB([m], [sinf], [], [AC_MSG_ERROR(["** ERROR: Math library not found **"])])
# Check header files

# Check typedefs, structures and so

# Check library functions
AM_PATH_SDL2([2.0.0], :, AC_MSG_ERROR(["** ERROR: SDL 2.0 is required **"]))
PKG_CHECK_MODULES([CHECK], [check >= 0.9.6])

# Output
Expand Down
5 changes: 3 additions & 2 deletions src/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
noinst_LIBRARIES = lib8.a
lib8_a_SOURCES = cpu.c cpu.h
lib8_a_CFLAGS = -std=c99 -Wall

AM_CFLAGS = --std=c99 -Wall
bin_PROGRAMS = chip8
chip8_SOURCES = chip8.c sdl.c sdl.h
chip8_LDADD = lib8.a
chip8_CFLAGS = @SDL_CFLAGS@ -std=c99 -Wall
chip8_LDADD = lib8.a @SDL_LIBS@
3 changes: 1 addition & 2 deletions src/chip8.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* chip8 is a CHIP-8 emulator done in C
* Copyright (C) 2015 Dani Rodríguez <danirod@outlook.com>
* Copyright (C) 2015-2016 Dani Rodríguez <danirod@outlook.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -24,7 +24,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include <SDL2/SDL.h>

/* Flag set by '--hex' */
static int use_hexloader;
Expand Down
4 changes: 2 additions & 2 deletions src/cpu.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* chip8 is a CHIP-8 emulator done in C
* Copyright (C) 2015 Dani Rodríguez <danirod@outlook.com>
* Copyright (C) 2015-2016 Dani Rodríguez <danirod@outlook.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -363,4 +363,4 @@ update_time(struct machine_t* cpu, int delta)
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/sdl.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#include "cpu.h"

#include <SDL2/SDL.h>
#include <SDL.h>

int init_context();

Expand Down

0 comments on commit f521653

Please sign in to comment.