Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5558 in orxonox.OLD for branches/world_entities/src/lib/event


Ignore:
Timestamp:
Nov 13, 2005, 3:10:49 PM (19 years ago)
Author:
bensch
Message:

orxonox/branches/world_entities: merged the Trunk to the world_entities branche
merged with command
svn merge -r5516:HEAD ../trunk/ world_entities/
no conflicts

Location:
branches/world_entities/src/lib/event
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/world_entities/src/lib/event/Makefile.in

    r5527 r5558  
    210210          esac; \
    211211        done; \
    212         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/event/Makefile'; \
     212        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/event/Makefile'; \
    213213        cd $(top_srcdir) && \
    214           $(AUTOMAKE) --gnu  src/lib/event/Makefile
     214          $(AUTOMAKE) --foreign  src/lib/event/Makefile
    215215.PRECIOUS: Makefile
    216216Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • branches/world_entities/src/lib/event/event_def.h

    r5477 r5558  
    3131  EV_VIDEO_RESIZE,
    3232
     33  EV_MAIN_QUIT,
     34
    3335  EV_UNKNOWN,
    3436

  • branches/world_entities/src/lib/event/event_handler.cc

    r5477 r5558  
    308308          ev.resize = event.resize;
    309309          ev.type = EV_VIDEO_RESIZE;
     310          break;
     311        case SDL_QUIT:
     312          ev.type = EV_MAIN_QUIT;
    310313          break;
    311314        default:
Note: See TracChangeset for help on using the changeset viewer.