From f212edb4ea85a56094809ae4edd22ac214b4ebd5 Mon Sep 17 00:00:00 2001 From: "Martin Felis (schakeline)" Date: Sun, 13 Feb 2011 17:14:06 +0100 Subject: [PATCH] beta 2 tweaks for the linux version --- CMakeLists.txt | 36 ++++++++++++++++++++++++++++++++++++ asteroids.rc | 3 +++ 2 files changed, 39 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b1f150..7455b15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,22 +38,58 @@ SET ( ASTEROIDS_SOURCES asteroids/View.cc ) +SET ( ASTEROIDSEDITOR_SOURCES + asteroids/AsteroidEntity.cc + asteroids/Controller.cc + asteroids/ControllerCommands.cc + asteroids/EntityFactory.cc + asteroids/EnumToString.cc + asteroids/Game.cc + asteroids/editormain.cc + asteroids/Model.cc + asteroids/ModelCommands.cc + asteroids/Physics.cc + asteroids/RocketEntity.cc + asteroids/ShipEntity.cc + asteroids/View.cc + ) + ADD_EXECUTABLE ( fysxasteroids ${ASTEROIDS_SOURCES} ) +ADD_EXECUTABLE ( fysxasteroidseditor ${ASTEROIDSEDITOR_SOURCES} ) TARGET_LINK_LIBRARIES ( fysxasteroids Engine oglft ) +TARGET_LINK_LIBRARIES ( fysxasteroidseditor + Engine + oglft + ) + SET ( DATA_DIR data/ ) +SET ( DATA_FILES + asteroids.rc + config.rc + ) + INSTALL (TARGETS fysxasteroids RUNTIME DESTINATION bin LIBRARY DESTINATION lib ) +INSTALL (TARGETS fysxasteroidseditor + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ) + INSTALL (DIRECTORY ${DATA_DIR} DESTINATION share/fysxasteroids/data ) + +INSTALL (FILES ${DATA_FILES} + DESTINATION share/fysxasteroids + ) diff --git a/asteroids.rc b/asteroids.rc index 5153b49..6e64957 100644 --- a/asteroids.rc +++ b/asteroids.rc @@ -9,3 +9,6 @@ set ship_maxspeed 10 set ship_acceleration 10 set ship_rotationspeed 180 set ship_maxattackrate 10 + +set rocket_timetolive 1.0 +set rocket_speed 15