Permalink
Browse files

Fixed remaining compilation issues.

  • Loading branch information...
Maciej Makowski
Maciej Makowski committed Feb 24, 2014
1 parent 327b6cb commit 746e8b26fdbaa17be05fc262bf60d1ba6fb12802
Showing with 7 additions and 3 deletions.
  1. +2 −2 Makefile.emscripten
  2. +1 −1 TARGET
  3. BIN board.o
  4. +4 −0 controls.c
View
@@ -37,7 +37,7 @@ VERSION=$(shell cat VERSION)
# These should be ok for most
#SDL_CONFIG?=sdl-config
CFLAGS?=-O3 -pipe
CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \
CFLAGS+=-Wall -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \
-DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER)
LDFLAGS=
# Use these instead for debugging and/or profiling (mainly intended for GNU Robbo developers)
@@ -60,7 +60,7 @@ $(TARGET): $(OBJECTS)
.PHONY: all clean install
clean:
rm -f *.o
rm -f *.o gnurobbo.bc
install:
@if [ "$(PACKAGE_DATA_DIR)" = ./data ] ; then \
View
2 TARGET
@@ -1 +1 @@
gnurobbo
gnurobbo.bc
View
BIN -40.2 KB board.o
Binary file not shown.
View
@@ -1477,6 +1477,7 @@ void get_input_device_text (int device, int id, char *joyname, char *text)
case SDLK_RMETA:
strcpy (text, txt_key_RMeta);
break;
#ifndef EMSCRIPTEN
case SDLK_LMETA:
strcpy (text, txt_key_LMeta);
break;
@@ -1486,6 +1487,7 @@ void get_input_device_text (int device, int id, char *joyname, char *text)
case SDLK_RSUPER:
strcpy (text, txt_key_RSuper);
break;
#endif
case SDLK_MODE:
strcpy (text, txt_key_AltGr);
break;
@@ -1510,9 +1512,11 @@ void get_input_device_text (int device, int id, char *joyname, char *text)
case SDLK_POWER:
strcpy (text, txt_key_Power);
break;
#ifndef EMSCRIPTEN
case SDLK_EURO:
strcpy (text, txt_key_Euro);
break;
#endif
case SDLK_UNDO:
strcpy (text, txt_key_Undo);
break;

0 comments on commit 746e8b2

Please sign in to comment.