ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed linux compilation problems, updated cmake project files.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10927 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2012-03-06 11:37:47 +00:00
parent 65c73e9186
commit 9bce8f574b
3 changed files with 216 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

425
sources.cmake
View File

@@ -1,229 +1,230 @@
# Generated by ./generate_source_cmake.sh. Do not edit this file manually.
# Generated by ./update_file_list.sh. Do not edit this file manually.
set(STK_SOURCES
src/utils/random_generator.cpp
src/utils/string_utils.cpp
src/utils/translation.cpp
src/utils/leak_check.cpp
src/utils/constants.cpp
src/utils/profiler.cpp
src/tutorial/tutorial_data.cpp
src/tutorial/tutorial_manager.cpp
src/tutorial/tutorial.cpp
src/animations/ipo.cpp
src/animations/three_d_animation.cpp
src/animations/billboard_animation.cpp
src/animations/animation_base.cpp
src/items/rubber_ball.cpp
src/items/cake.cpp
src/items/plunger.cpp
src/items/attachment_manager.cpp
src/items/rubber_band.cpp
src/items/swatter.cpp
src/items/projectile_manager.cpp
src/items/flyable.cpp
src/items/powerup_manager.cpp
src/items/item.cpp
src/items/attachment.cpp
src/items/item_manager.cpp
src/items/bowling.cpp
src/items/powerup.cpp
src/race/grand_prix_manager.cpp
src/race/highscores.cpp
src/race/race_manager.cpp
src/race/highscore_manager.cpp
src/race/grand_prix_data.cpp
src/race/history.cpp
src/tracks/quad.cpp
src/tracks/track_object_manager.cpp
src/tracks/track_manager.cpp
src/tracks/lod_node_loader.cpp
src/tracks/check_line.cpp
src/tracks/check_sphere.cpp
src/tracks/track_object.cpp
src/tracks/bezier_curve.cpp
src/tracks/graph_node.cpp
src/tracks/check_structure.cpp
src/tracks/ambient_light_sphere.cpp
src/tracks/track.cpp
src/tracks/check_manager.cpp
src/tracks/check_lap.cpp
src/tracks/terrain_info.cpp
src/tracks/track_sector.cpp
src/tracks/quad_set.cpp
src/tracks/quad_graph.cpp
src/network/kart_control_message.cpp
src/network/kart_update_message.cpp
src/network/race_info_message.cpp
src/network/network_manager.cpp
src/network/race_result_message.cpp
src/network/network_kart.cpp
src/network/message.cpp
src/network/race_state.cpp
src/network/connect_message.cpp
src/karts/controller/default_ai_controller.cpp
src/karts/controller/new_ai_controller.cpp
src/karts/controller/end_controller.cpp
src/karts/controller/player_controller.cpp
src/karts/controller/controller.cpp
src/karts/controller/ai_base_controller.cpp
src/karts/emergency_animation.cpp
src/karts/kart_model.cpp
src/karts/ghost_kart.cpp
src/karts/kart.cpp
src/karts/kart_properties_manager.cpp
src/karts/kart_properties.cpp
src/karts/moveable.cpp
src/karts/skidding_properties.cpp
src/karts/skidding.cpp
src/karts/max_speed.cpp
src/karts/kart_with_stats.cpp
src/karts/kart_gfx.cpp
src/physics/btKartRaycast.cpp
src/physics/btKart.cpp
src/physics/physics.cpp
src/physics/btUprightConstraint.cpp
src/physics/triangle_mesh.cpp
src/physics/irr_debug_drawer.cpp
src/physics/physical_object.cpp
src/states_screens/grand_prix_win.cpp
src/states_screens/arenas_screen.cpp
src/states_screens/race_gui.cpp
src/states_screens/minimal_race_gui.cpp
src/states_screens/feature_unlocked.cpp
src/states_screens/options_screen_input2.cpp
src/states_screens/options_screen_input.cpp
src/states_screens/help_screen_4.cpp
src/states_screens/race_gui_overworld.cpp
src/states_screens/tutorial_screen.cpp
src/states_screens/credits.cpp
src/states_screens/help_screen_2.cpp
src/states_screens/state_manager.cpp
src/states_screens/tracks_screen.cpp
src/states_screens/help_screen_3.cpp
src/states_screens/race_result_gui.cpp
src/states_screens/options_screen_players.cpp
src/states_screens/addons_screen.cpp
src/states_screens/race_gui_base.cpp
src/states_screens/main_menu_screen.cpp
src/states_screens/options_screen_ui.cpp
src/states_screens/kart_selection.cpp
src/states_screens/grand_prix_lose.cpp
src/states_screens/options_screen_audio.cpp
src/states_screens/race_setup_screen.cpp
src/states_screens/dialogs/track_info_dialog.cpp
src/states_screens/dialogs/select_challenge.cpp
src/states_screens/dialogs/custom_video_settings.cpp
src/states_screens/dialogs/story_mode_new.cpp
src/states_screens/dialogs/press_a_key_dialog.cpp
src/states_screens/dialogs/message_dialog.cpp
src/states_screens/dialogs/race_over_dialog.cpp
src/states_screens/dialogs/race_paused_dialog.cpp
src/states_screens/dialogs/add_device_dialog.cpp
src/states_screens/dialogs/gp_info_dialog.cpp
src/states_screens/dialogs/player_info_dialog.cpp
src/states_screens/dialogs/enter_player_name_dialog.cpp
src/states_screens/dialogs/confirm_resolution_dialog.cpp
src/states_screens/dialogs/addons_loading.cpp
src/states_screens/story_mode_lobby.cpp
src/states_screens/help_screen_1.cpp
src/states_screens/options_screen_video.cpp
src/input/wiimote_manager.cpp
src/input/input_manager.cpp
src/input/binding.cpp
src/input/device_manager.cpp
src/input/input_device.cpp
src/addons/zip.cpp
src/addons/network_http.cpp
src/addons/addons_manager.cpp
src/addons/addon.cpp
src/addons/request.cpp
src/addons/news_manager.cpp
src/graphics/particle_kind.cpp
src/graphics/slip_stream.cpp
src/graphics/skid_marks.cpp
src/graphics/rain.cpp
src/graphics/referee.cpp
src/graphics/material_manager.cpp
src/graphics/material.cpp
src/graphics/hardware_skinning.cpp
src/graphics/stars.cpp
src/graphics/particle_emitter.cpp
src/graphics/explosion.cpp
src/graphics/mesh_tools.cpp
src/graphics/hit_sfx.cpp
src/graphics/irr_driver.cpp
src/graphics/camera.cpp
src/graphics/particle_kind_manager.cpp
src/graphics/post_processing.cpp
src/graphics/CBatchingMesh.cpp
src/graphics/lod_node.cpp
src/graphics/shadow.cpp
src/graphics/per_camera_node.cpp
src/graphics/moving_texture.cpp
src/config/stk_config.cpp
src/config/user_config.cpp
src/config/device_config.cpp
src/tinygettext/plural_forms.cpp
src/tinygettext/iconv.cpp
src/tinygettext/stk_file_system.cpp
src/tinygettext/po_parser.cpp
src/tinygettext/log.cpp
src/tinygettext/language.cpp
src/tinygettext/dictionary_manager.cpp
src/tinygettext/tinygettext.cpp
src/tinygettext/dictionary.cpp
src/utils/vec3.cpp
src/audio/music_information.cpp
src/utils/constants.cpp
src/utils/translation.cpp
src/utils/random_generator.cpp
src/utils/profiler.cpp
src/utils/string_utils.cpp
src/utils/leak_check.cpp
src/audio/sfx_manager.cpp
src/audio/music_ogg.cpp
src/audio/music_manager.cpp
src/audio/sfx_openal.cpp
src/audio/sfx_buffer.cpp
src/audio/music_manager.cpp
src/audio/music_ogg.cpp
src/audio/sfx_manager.cpp
src/replay/replay_base.cpp
src/replay/replay_play.cpp
src/replay/replay_recorder.cpp
src/guiengine/widgets/label_widget.cpp
src/audio/music_information.cpp
src/main_loop.cpp
src/guiengine/scalable_font.cpp
src/guiengine/abstract_top_level_container.cpp
src/guiengine/engine.cpp
src/guiengine/skin.cpp
src/guiengine/screen_loader.cpp
src/guiengine/modaldialog.cpp
src/guiengine/widget.cpp
src/guiengine/abstract_state_manager.cpp
src/guiengine/screen.cpp
src/guiengine/CGUISpriteBank.cpp
src/guiengine/layout_manager.cpp
src/guiengine/widgets/text_box_widget.cpp
src/guiengine/widgets/dynamic_ribbon_widget.cpp
src/guiengine/widgets/spinner_widget.cpp
src/guiengine/widgets/list_widget.cpp
src/guiengine/widgets/button_widget.cpp
src/guiengine/widgets/icon_button_widget.cpp
src/guiengine/widgets/bubble_widget.cpp
src/guiengine/widgets/progress_bar_widget.cpp
src/guiengine/widgets/model_view_widget.cpp
src/guiengine/widgets/icon_button_widget.cpp
src/guiengine/widgets/list_widget.cpp
src/guiengine/widgets/label_widget.cpp
src/guiengine/widgets/bubble_widget.cpp
src/guiengine/widgets/button_widget.cpp
src/guiengine/widgets/ribbon_widget.cpp
src/guiengine/widgets/CGUIEditBox.cpp
src/guiengine/widgets/check_box_widget.cpp
src/guiengine/widgets/dynamic_ribbon_widget.cpp
src/guiengine/widgets/text_box_widget.cpp
src/guiengine/CGUISpriteBank.cpp
src/guiengine/engine.cpp
src/guiengine/screen.cpp
src/guiengine/skin.cpp
src/guiengine/modaldialog.cpp
src/guiengine/scalable_font.cpp
src/guiengine/widgets/progress_bar_widget.cpp
src/guiengine/event_handler.cpp
src/guiengine/layout_manager.cpp
src/guiengine/abstract_top_level_container.cpp
src/guiengine/screen_loader.cpp
src/guiengine/abstract_state_manager.cpp
src/guiengine/widget.cpp
src/items/flyable.cpp
src/items/bowling.cpp
src/items/projectile_manager.cpp
src/items/rubber_band.cpp
src/items/powerup_manager.cpp
src/items/cake.cpp
src/items/powerup.cpp
src/items/attachment_manager.cpp
src/items/swatter.cpp
src/items/item_manager.cpp
src/items/plunger.cpp
src/items/attachment.cpp
src/items/rubber_ball.cpp
src/items/item.cpp
src/tinygettext/dictionary.cpp
src/tinygettext/dictionary_manager.cpp
src/tinygettext/language.cpp
src/tinygettext/log.cpp
src/tinygettext/iconv.cpp
src/tinygettext/stk_file_system.cpp
src/tinygettext/tinygettext.cpp
src/tinygettext/plural_forms.cpp
src/tinygettext/po_parser.cpp
src/main_loop.cpp
src/tutorial/tutorial.cpp
src/tutorial/tutorial_data.cpp
src/tutorial/tutorial_manager.cpp
src/animations/three_d_animation.cpp
src/animations/animation_base.cpp
src/animations/billboard_animation.cpp
src/animations/ipo.cpp
src/karts/skidding.cpp
src/karts/ghost_kart.cpp
src/karts/kart_model.cpp
src/karts/kart_with_stats.cpp
src/karts/kart_gfx.cpp
src/karts/kart_properties.cpp
src/karts/kart.cpp
src/karts/kart_properties_manager.cpp
src/karts/emergency_animation.cpp
src/karts/controller/player_controller.cpp
src/karts/controller/default_ai_controller.cpp
src/karts/controller/ai_base_controller.cpp
src/karts/controller/new_ai_controller.cpp
src/karts/controller/end_controller.cpp
src/karts/controller/controller.cpp
src/karts/moveable.cpp
src/karts/max_speed.cpp
src/states_screens/race_gui_base.cpp
src/states_screens/help_screen_3.cpp
src/states_screens/options_screen_input2.cpp
src/states_screens/credits.cpp
src/states_screens/grand_prix_lose.cpp
src/states_screens/race_gui.cpp
src/states_screens/help_screen_1.cpp
src/states_screens/options_screen_players.cpp
src/states_screens/dialogs/custom_video_settings.cpp
src/states_screens/dialogs/press_a_key_dialog.cpp
src/states_screens/dialogs/select_challenge.cpp
src/states_screens/dialogs/story_mode_new.cpp
src/states_screens/dialogs/message_dialog.cpp
src/states_screens/dialogs/player_info_dialog.cpp
src/states_screens/dialogs/confirm_resolution_dialog.cpp
src/states_screens/dialogs/enter_player_name_dialog.cpp
src/states_screens/dialogs/add_device_dialog.cpp
src/states_screens/dialogs/race_over_dialog.cpp
src/states_screens/dialogs/race_paused_dialog.cpp
src/states_screens/dialogs/gp_info_dialog.cpp
src/states_screens/dialogs/track_info_dialog.cpp
src/states_screens/dialogs/addons_loading.cpp
src/states_screens/kart_selection.cpp
src/states_screens/tutorial_screen.cpp
src/states_screens/options_screen_audio.cpp
src/states_screens/tracks_screen.cpp
src/states_screens/race_result_gui.cpp
src/states_screens/options_screen_video.cpp
src/states_screens/story_mode_lobby.cpp
src/states_screens/grand_prix_win.cpp
src/states_screens/addons_screen.cpp
src/states_screens/feature_unlocked.cpp
src/states_screens/help_screen_2.cpp
src/states_screens/race_setup_screen.cpp
src/states_screens/options_screen_input.cpp
src/states_screens/arenas_screen.cpp
src/states_screens/race_gui_overworld.cpp
src/states_screens/options_screen_ui.cpp
src/states_screens/main_menu_screen.cpp
src/states_screens/help_screen_4.cpp
src/states_screens/minimal_race_gui.cpp
src/states_screens/state_manager.cpp
src/replay/replay_play.cpp
src/replay/replay_recorder.cpp
src/replay/replay_base.cpp
src/io/xml_writer.cpp
src/io/xml_node.cpp
src/io/file_manager.cpp
src/io/xml_node.cpp
src/main.cpp
src/modes/world.cpp
src/modes/world_status.cpp
src/modes/tutorial_race.cpp
src/modes/linear_world.cpp
src/modes/overworld.cpp
src/modes/game_tutorial.cpp
src/modes/follow_the_leader.cpp
src/modes/three_strikes_battle.cpp
src/modes/standard_race.cpp
src/modes/profile_world.cpp
src/modes/world_with_rank.cpp
src/challenges/challenge_data.cpp
src/challenges/game_slot.cpp
src/challenges/unlock_manager.cpp
src/challenges/challenge.cpp
src/addons/network_http.cpp
src/addons/news_manager.cpp
src/addons/addon.cpp
src/addons/zip.cpp
src/addons/request.cpp
src/addons/addons_manager.cpp
src/tracks/check_manager.cpp
src/tracks/graph_node.cpp
src/tracks/lod_node_loader.cpp
src/tracks/check_sphere.cpp
src/tracks/terrain_info.cpp
src/tracks/quad.cpp
src/tracks/quad_set.cpp
src/tracks/check_structure.cpp
src/tracks/bezier_curve.cpp
src/tracks/track_object.cpp
src/tracks/check_lap.cpp
src/tracks/check_line.cpp
src/tracks/track_sector.cpp
src/tracks/track.cpp
src/tracks/track_object_manager.cpp
src/tracks/ambient_light_sphere.cpp
src/tracks/track_manager.cpp
src/tracks/quad_graph.cpp
src/input/input_manager.cpp
src/input/device_manager.cpp
src/input/binding.cpp
src/input/wiimote_manager.cpp
src/input/input_device.cpp
src/config/device_config.cpp
src/config/stk_config.cpp
src/config/user_config.cpp
src/network/kart_update_message.cpp
src/network/race_info_message.cpp
src/network/network_kart.cpp
src/network/connect_message.cpp
src/network/message.cpp
src/network/network_manager.cpp
src/network/kart_control_message.cpp
src/network/race_state.cpp
src/network/race_result_message.cpp
src/graphics/camera.cpp
src/graphics/shadow.cpp
src/graphics/slip_stream.cpp
src/graphics/irr_driver.cpp
src/graphics/hit_sfx.cpp
src/graphics/particle_emitter.cpp
src/graphics/hardware_skinning.cpp
src/graphics/post_processing.cpp
src/graphics/CBatchingMesh.cpp
src/graphics/explosion.cpp
src/graphics/referee.cpp
src/graphics/material_manager.cpp
src/graphics/stars.cpp
src/graphics/rain.cpp
src/graphics/skid_marks.cpp
src/graphics/mesh_tools.cpp
src/graphics/particle_kind_manager.cpp
src/graphics/particle_kind.cpp
src/graphics/material.cpp
src/graphics/lod_node.cpp
src/graphics/moving_texture.cpp
src/graphics/per_camera_node.cpp
src/race/race_manager.cpp
src/race/highscores.cpp
src/race/grand_prix_data.cpp
src/race/highscore_manager.cpp
src/race/grand_prix_manager.cpp
src/race/history.cpp
src/physics/btKart.cpp
src/physics/btUprightConstraint.cpp
src/physics/triangle_mesh.cpp
src/physics/physical_object.cpp
src/physics/btKartRaycast.cpp
src/physics/physics.cpp
src/physics/irr_debug_drawer.cpp
src/main.cpp
src/modes/game_tutorial.cpp
src/modes/world_status.cpp
src/modes/world_with_rank.cpp
src/modes/standard_race.cpp
src/modes/linear_world.cpp
src/modes/profile_world.cpp
src/modes/world.cpp
src/modes/three_strikes_battle.cpp
src/modes/tutorial_race.cpp
src/modes/follow_the_leader.cpp
src/modes/overworld.cpp
)

3
src/karts/skidding.hpp
View File

@@ -56,8 +56,7 @@ private:
/** A read-only pointer to the kart's properties. */
Kart *m_kart;
unsigned int Skidding::getSkidBonus(float *bonus_time,
float *bonus_speed) const;
unsigned int getSkidBonus(float *bonus_time, float *bonus_speed) const;
public:
Skidding(Kart *kart, const SkiddingProperties *sp);

3
src/karts/skidding_properties.hpp
View File

@@ -25,6 +25,7 @@
class Kart;
class XMLNode;
#include <string>
#include <vector>
/** A simple class that stores all skidding related properties. It acts as
@@ -97,7 +98,7 @@ public:
SkiddingProperties();
void load(const XMLNode *skid_node);
void copyFrom(const SkiddingProperties *destination);
void SkiddingProperties::checkAllSet(const std::string &filename) const;
void checkAllSet(const std::string &filename) const;
// ------------------------------------------------------------------------
/** Returns if the kart leaves skidmarks or not. */
bool hasSkidmarks() const { return m_has_skidmarks; }