Merge pull request #1 from aliaspider/master

fix x86 build
2014-07-14 06:18:50 +02:00 · 2014-07-14 06:18:50 +02:00 · 1cf2a0cbfe
parent a8ff99c68b 0ccab79884
commit 1cf2a0cbfe
2 changed files with 1 additions and 2 deletions
--- a/input.c
+++ b/input.c
@ -588,7 +588,6 @@ u32 update_input()
        key &= ~(joy_map(event.jbutton.button));
        break;
      }
-      }
    }
  }

--- a/x86/Makefile
+++ b/x86/Makefile
@ -17,7 +17,7 @@ BIN       ?= gpsp.exe
 VPATH      += ..
 CFLAGS     += -DPC_BUILD -Wall -m32
 INCLUDES   = -I${PREFIX}/include `sdl-config --cflags`
-LIBS       = -L${PREFIX}/lib `sdl-config --libs` -mconsole -lz -m32
+LIBS       = -L${PREFIX}/lib `sdl-config --libs` -lz -m32

 # Compilation: