diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 4b492ac048..dfb4818b33 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -988,8 +988,8 @@ C686F8971CDBC37E009F9BFC /* map_element */, C686F8A41CDBC37E009F9BFC /* sprite */, C686F8A21CDBC37E009F9BFC /* paint.c */, - C686F8A31CDBC37E009F9BFC /* paint.h */, C686F8AA1CDBC37E009F9BFC /* supports.c */, + C686F8A31CDBC37E009F9BFC /* paint.h */, C686F8AB1CDBC37E009F9BFC /* supports.h */, ); path = paint; @@ -1174,44 +1174,44 @@ D442718E1CC81B3200D84D28 /* windows */, D44271D81CC81B3200D84D28 /* world */, D44270CD1CC81B3200D84D28 /* addresses.c */, - D44270CE1CC81B3200D84D28 /* addresses.h */, D44270D41CC81B3200D84D28 /* cheats.c */, - D44270D51CC81B3200D84D28 /* cheats.h */, D44270DC1CC81B3200D84D28 /* cmdline_sprite.c */, - D44270DD1CC81B3200D84D28 /* common.h */, D44270DE1CC81B3200D84D28 /* config.c */, - D44270DF1CC81B3200D84D28 /* config.h */, D44270FC1CC81B3200D84D28 /* cursors.c */, - D44270FD1CC81B3200D84D28 /* cursors.h */, D44270FE1CC81B3200D84D28 /* diagnostic.c */, - D44270FF1CC81B3200D84D28 /* diagnostic.h */, D442710E1CC81B3200D84D28 /* editor.c */, - D442710F1CC81B3200D84D28 /* editor.h */, D44271101CC81B3200D84D28 /* game.c */, - D44271111CC81B3200D84D28 /* game.h */, D44271121CC81B3200D84D28 /* hook.c */, - D44271131CC81B3200D84D28 /* hook.h */, D44271141CC81B3200D84D28 /* image_io.c */, - D44271151CC81B3200D84D28 /* image_io.h */, D44271161CC81B3200D84D28 /* input.c */, - D44271171CC81B3200D84D28 /* input.h */, D44271301CC81B3200D84D28 /* intro.c */, - D44271311CC81B3200D84D28 /* intro.h */, D44271561CC81B3200D84D28 /* object_list.c */, D44271571CC81B3200D84D28 /* object.c */, - D44271581CC81B3200D84D28 /* object.h */, D44271591CC81B3200D84D28 /* openrct2.c */, - D442715A1CC81B3200D84D28 /* openrct2.h */, D44271691CC81B3200D84D28 /* rct1.c */, - D442716A1CC81B3200D84D28 /* rct1.h */, D442716B1CC81B3200D84D28 /* rct2.c */, - D442716C1CC81B3200D84D28 /* rct2.h */, D44271811CC81B3200D84D28 /* scenario_list.c */, D44271821CC81B3200D84D28 /* scenario_sources.c */, D44271831CC81B3200D84D28 /* scenario.c */, + D44271861CC81B3200D84D28 /* title.c */, + D44270CE1CC81B3200D84D28 /* addresses.h */, + D44270D51CC81B3200D84D28 /* cheats.h */, + D44270DD1CC81B3200D84D28 /* common.h */, + D44270DF1CC81B3200D84D28 /* config.h */, + D44270FD1CC81B3200D84D28 /* cursors.h */, + D44270FF1CC81B3200D84D28 /* diagnostic.h */, + D442710F1CC81B3200D84D28 /* editor.h */, + D44271111CC81B3200D84D28 /* game.h */, + D44271131CC81B3200D84D28 /* hook.h */, + D44271151CC81B3200D84D28 /* image_io.h */, + D44271171CC81B3200D84D28 /* input.h */, + D44271311CC81B3200D84D28 /* intro.h */, + D44271581CC81B3200D84D28 /* object.h */, + D442715A1CC81B3200D84D28 /* openrct2.h */, + D442716A1CC81B3200D84D28 /* rct1.h */, + D442716C1CC81B3200D84D28 /* rct2.h */, D44271841CC81B3200D84D28 /* scenario.h */, D44271851CC81B3200D84D28 /* sprites.h */, - D44271861CC81B3200D84D28 /* title.c */, D44271871CC81B3200D84D28 /* title.h */, D442718D1CC81B3200D84D28 /* version.h */, ); @@ -1320,10 +1320,10 @@ D44271001CC81B3200D84D28 /* drawing */ = { isa = PBXGroup; children = ( + D497667F1D03B9FE002222CD /* engines */, D44271031CC81B3200D84D28 /* drawing_fast.cpp */, D44271011CC81B3200D84D28 /* drawing.c */, D44271021CC81B3200D84D28 /* drawing.h */, - D497667F1D03B9FE002222CD /* engines */, D44271041CC81B3200D84D28 /* font.c */, D44271051CC81B3200D84D28 /* font.h */, D497668A1D03BAC8002222CD /* IDrawingContext.h */, @@ -1360,9 +1360,9 @@ D44271261CC81B3200D84D28 /* themes.h */, D44271271CC81B3200D84D28 /* title_sequences.c */, D44271281CC81B3200D84D28 /* title_sequences.h */, + D442712B1CC81B3200D84D28 /* viewport_interaction.c */, D44271291CC81B3200D84D28 /* viewport.c */, D442712A1CC81B3200D84D28 /* viewport.h */, - D442712B1CC81B3200D84D28 /* viewport_interaction.c */, D442712C1CC81B3200D84D28 /* widget.c */, D442712D1CC81B3200D84D28 /* widget.h */, D442712E1CC81B3200D84D28 /* window.c */, @@ -1415,23 +1415,23 @@ D442714F1CC81B3200D84D28 /* network */ = { isa = PBXGroup; children = ( + D44271501CC81B3200D84D28 /* http.cpp */, + D44271511CC81B3200D84D28 /* http.h */, + D44271521CC81B3200D84D28 /* network.cpp */, + D44271531CC81B3200D84D28 /* network.h */, 007A05C01CFB2C8B00F419C3 /* NetworkAction.cpp */, 007A05C11CFB2C8B00F419C3 /* NetworkAction.h */, 007A05C41CFB2C8B00F419C3 /* NetworkConnection.cpp */, 007A05C51CFB2C8B00F419C3 /* NetworkConnection.h */, 007A05C61CFB2C8B00F419C3 /* NetworkGroup.cpp */, 007A05C71CFB2C8B00F419C3 /* NetworkGroup.h */, + 00EFEE701CF1D80B0035213B /* NetworkKey.cpp */, + 00EFEE711CF1D80B0035213B /* NetworkKey.h */, 007A05C81CFB2C8B00F419C3 /* NetworkPacket.cpp */, 007A05C91CFB2C8B00F419C3 /* NetworkPacket.h */, 007A05CA1CFB2C8B00F419C3 /* NetworkPlayer.cpp */, 007A05CB1CFB2C8B00F419C3 /* NetworkPlayer.h */, 007A05CC1CFB2C8B00F419C3 /* NetworkTypes.h */, - D44271501CC81B3200D84D28 /* http.cpp */, - D44271511CC81B3200D84D28 /* http.h */, - D44271521CC81B3200D84D28 /* network.cpp */, - D44271531CC81B3200D84D28 /* network.h */, - 00EFEE701CF1D80B0035213B /* NetworkKey.cpp */, - 00EFEE711CF1D80B0035213B /* NetworkKey.h */, C61FB7221CF86356004CE991 /* NetworkUser.cpp */, C61FB7231CF86356004CE991 /* NetworkUser.h */, D48A8D811D00272F00649DA7 /* TcpSocket.cpp */, @@ -1477,29 +1477,29 @@ C686F8F01CDBC3B7009F9BFC /* thrill */, C686F8FC1CDBC3B7009F9BFC /* transport */, C686F9021CDBC3B7009F9BFC /* water */, + D442716F1CC81B3200D84D28 /* cable_lift.c */, + D44271731CC81B3200D84D28 /* ride_data.c */, + D44271751CC81B3200D84D28 /* ride_ratings.c */, + D44271711CC81B3200D84D28 /* ride.c */, + D44271771CC81B3200D84D28 /* station.c */, + D442717B1CC81B3200D84D28 /* track_data.c */, 008BF7261CDAA5C30019A2AD /* track_design_index.c */, 008BF7271CDAA5C30019A2AD /* track_design_save.c */, 008BF7281CDAA5C30019A2AD /* track_design.c */, - 008BF7291CDAA5C30019A2AD /* track_design.h */, - D442716F1CC81B3200D84D28 /* cable_lift.c */, - D44271701CC81B3200D84D28 /* cable_lift.h */, - D44271731CC81B3200D84D28 /* ride_data.c */, - D44271741CC81B3200D84D28 /* ride_data.h */, - D44271751CC81B3200D84D28 /* ride_ratings.c */, - D44271761CC81B3200D84D28 /* ride_ratings.h */, - D44271711CC81B3200D84D28 /* ride.c */, - D44271721CC81B3200D84D28 /* ride.h */, - D44271771CC81B3200D84D28 /* station.c */, - D44271781CC81B3200D84D28 /* station.h */, - D442717B1CC81B3200D84D28 /* track_data.c */, - D442717C1CC81B3200D84D28 /* track_data.h */, D442717D1CC81B3200D84D28 /* track_paint.c */, - D442717E1CC81B3200D84D28 /* track_paint.h */, D44271791CC81B3200D84D28 /* track.c */, - D442717A1CC81B3200D84D28 /* track.h */, C686F9561CDBC4C7009F9BFC /* vehicle_paint.c */, - C686F9571CDBC4C7009F9BFC /* vehicle_paint.h */, D442717F1CC81B3200D84D28 /* vehicle.c */, + D44271701CC81B3200D84D28 /* cable_lift.h */, + D44271741CC81B3200D84D28 /* ride_data.h */, + D44271761CC81B3200D84D28 /* ride_ratings.h */, + D44271721CC81B3200D84D28 /* ride.h */, + D44271781CC81B3200D84D28 /* station.h */, + D442717C1CC81B3200D84D28 /* track_data.h */, + 008BF7291CDAA5C30019A2AD /* track_design.h */, + D442717E1CC81B3200D84D28 /* track_paint.h */, + D442717A1CC81B3200D84D28 /* track.h */, + C686F9571CDBC4C7009F9BFC /* vehicle_paint.h */, D44271801CC81B3200D84D28 /* vehicle.h */, ); path = ride; @@ -1538,15 +1538,15 @@ D442719F1CC81B3200D84D28 /* finances.c */, D44271A01CC81B3200D84D28 /* footpath.c */, D44271A11CC81B3200D84D28 /* game_bottom_toolbar.c */, - D44271A21CC81B3200D84D28 /* guest.c */, D44271A31CC81B3200D84D28 /* guest_list.c */, + D44271A21CC81B3200D84D28 /* guest.c */, D44271A41CC81B3200D84D28 /* install_track.c */, - D44271A51CC81B3200D84D28 /* land.c */, D44271A61CC81B3200D84D28 /* land_rights.c */, + D44271A51CC81B3200D84D28 /* land.c */, D44271A71CC81B3200D84D28 /* loadsave.c */, D44271A81CC81B3200D84D28 /* main.c */, - D44271A91CC81B3200D84D28 /* map.c */, D44271AA1CC81B3200D84D28 /* map_tooltip.c */, + D44271A91CC81B3200D84D28 /* map.c */, D44271AB1CC81B3200D84D28 /* mapgen.c */, D44271AC1CC81B3200D84D28 /* maze_construction.c */, D44271AD1CC81B3200D84D28 /* multiplayer.c */, @@ -1554,16 +1554,16 @@ D44271AF1CC81B3200D84D28 /* network_status.c */, D44271B01CC81B3200D84D28 /* new_campaign.c */, D44271B11CC81B3200D84D28 /* new_ride.c */, - D44271B21CC81B3200D84D28 /* news.c */, D44271B31CC81B3200D84D28 /* news_options.c */, + D44271B21CC81B3200D84D28 /* news.c */, D44271B41CC81B3200D84D28 /* options.c */, D44271B51CC81B3200D84D28 /* park.c */, D44271B61CC81B3200D84D28 /* player.c */, D44271B71CC81B3200D84D28 /* publisher_credits.c */, D44271B81CC81B3200D84D28 /* research.c */, - D44271B91CC81B3200D84D28 /* ride.c */, D44271BA1CC81B3200D84D28 /* ride_construction.c */, D44271BB1CC81B3200D84D28 /* ride_list.c */, + D44271B91CC81B3200D84D28 /* ride.c */, D44271BC1CC81B3200D84D28 /* save_prompt.c */, D44271BD1CC81B3200D84D28 /* scenery.c */, D44271BE1CC81B3200D84D28 /* server_list.c */, @@ -1571,9 +1571,9 @@ D44271C01CC81B3200D84D28 /* shortcut_key_change.c */, D44271C11CC81B3200D84D28 /* shortcut_keys.c */, D44271C21CC81B3200D84D28 /* sign.c */, - D44271C31CC81B3200D84D28 /* staff.c */, D44271C41CC81B3200D84D28 /* staff_fire_prompt.c */, D44271C51CC81B3200D84D28 /* staff_list.c */, + D44271C31CC81B3200D84D28 /* staff.c */, D44271C61CC81B3200D84D28 /* text_input.c */, D44271C71CC81B3200D84D28 /* themes.c */, D44271C81CC81B3200D84D28 /* tile_inspector.c */, @@ -1610,12 +1610,12 @@ D44271E11CC81B3200D84D28 /* footpath.h */, D44271E21CC81B3200D84D28 /* fountain.c */, D44271E31CC81B3200D84D28 /* fountain.h */, - D44271E41CC81B3200D84D28 /* map.c */, - D44271E51CC81B3200D84D28 /* map.h */, D44271E61CC81B3200D84D28 /* map_animation.c */, D44271E71CC81B3200D84D28 /* map_animation.h */, D44271E81CC81B3200D84D28 /* map_helpers.c */, D44271E91CC81B3200D84D28 /* map_helpers.h */, + D44271E41CC81B3200D84D28 /* map.c */, + D44271E51CC81B3200D84D28 /* map.h */, D44271EA1CC81B3200D84D28 /* mapgen.c */, D44271EB1CC81B3200D84D28 /* mapgen.h */, D44271EC1CC81B3200D84D28 /* money_effect.c */, @@ -1645,8 +1645,8 @@ isa = PBXGroup; children = ( D45A38CB1CF3007A00659A24 /* aes.h */, - D45A38CC1CF3007A00659A24 /* asn1.h */, D45A38CD1CF3007A00659A24 /* asn1_mac.h */, + D45A38CC1CF3007A00659A24 /* asn1.h */, D45A38CE1CF3007A00659A24 /* asn1t.h */, D45A38CF1CF3007A00659A24 /* bio.h */, D45A38D01CF3007A00659A24 /* blowfish.h */, @@ -1657,11 +1657,11 @@ D45A38D51CF3007A00659A24 /* cmac.h */, D45A38D61CF3007A00659A24 /* cms.h */, D45A38D71CF3007A00659A24 /* comp.h */, - D45A38D81CF3007A00659A24 /* conf.h */, D45A38D91CF3007A00659A24 /* conf_api.h */, + D45A38D81CF3007A00659A24 /* conf.h */, D45A38DA1CF3007A00659A24 /* crypto.h */, - D45A38DB1CF3007A00659A24 /* des.h */, D45A38DC1CF3007A00659A24 /* des_old.h */, + D45A38DB1CF3007A00659A24 /* des.h */, D45A38DD1CF3007A00659A24 /* dh.h */, D45A38DE1CF3007A00659A24 /* dsa.h */, D45A38DF1CF3007A00659A24 /* dso.h */, @@ -1691,8 +1691,8 @@ D45A38F71CF3007A00659A24 /* ossl_typ.h */, D45A38F81CF3007A00659A24 /* pem.h */, D45A38F91CF3007A00659A24 /* pem2.h */, - D45A38FA1CF3007A00659A24 /* pkcs12.h */, D45A38FB1CF3007A00659A24 /* pkcs7.h */, + D45A38FA1CF3007A00659A24 /* pkcs12.h */, D45A38FC1CF3007A00659A24 /* pqueue.h */, D45A38FD1CF3007A00659A24 /* rand.h */, D45A38FE1CF3007A00659A24 /* rc2.h */, @@ -1706,18 +1706,18 @@ D45A39061CF3007A00659A24 /* srtp.h */, D45A39071CF3007A00659A24 /* ssl.h */, D45A39081CF3007A00659A24 /* ssl2.h */, - D45A39091CF3007A00659A24 /* ssl23.h */, D45A390A1CF3007A00659A24 /* ssl3.h */, + D45A39091CF3007A00659A24 /* ssl23.h */, D45A390B1CF3007A00659A24 /* stack.h */, D45A390C1CF3007A00659A24 /* symhacks.h */, D45A390D1CF3007A00659A24 /* tls1.h */, D45A390E1CF3007A00659A24 /* ts.h */, D45A390F1CF3007A00659A24 /* txt_db.h */, - D45A39101CF3007A00659A24 /* ui.h */, D45A39111CF3007A00659A24 /* ui_compat.h */, + D45A39101CF3007A00659A24 /* ui.h */, D45A39121CF3007A00659A24 /* whrlpool.h */, - D45A39131CF3007A00659A24 /* x509.h */, D45A39141CF3007A00659A24 /* x509_vfy.h */, + D45A39131CF3007A00659A24 /* x509.h */, D45A39151CF3007A00659A24 /* x509v3.h */, ); path = openssl; @@ -1728,7 +1728,6 @@ children = ( D45A39171CF3007A00659A24 /* begin_code.h */, D45A39181CF3007A00659A24 /* close_code.h */, - D45A39191CF3007A00659A24 /* SDL.h */, D45A391A1CF3007A00659A24 /* SDL_assert.h */, D45A391B1CF3007A00659A24 /* SDL_atomic.h */, D45A391C1CF3007A00659A24 /* SDL_audio.h */, @@ -1756,14 +1755,14 @@ D45A39321CF3007A00659A24 /* SDL_mouse.h */, D45A39331CF3007A00659A24 /* SDL_mutex.h */, D45A39341CF3007A00659A24 /* SDL_name.h */, - D45A39351CF3007A00659A24 /* SDL_opengl.h */, D45A39361CF3007A00659A24 /* SDL_opengl_glext.h */, + D45A39351CF3007A00659A24 /* SDL_opengl.h */, D45A39371CF3007A00659A24 /* SDL_opengles.h */, - D45A39381CF3007A00659A24 /* SDL_opengles2.h */, D45A39391CF3007A00659A24 /* SDL_opengles2_gl2.h */, D45A393A1CF3007A00659A24 /* SDL_opengles2_gl2ext.h */, D45A393B1CF3007A00659A24 /* SDL_opengles2_gl2platform.h */, D45A393C1CF3007A00659A24 /* SDL_opengles2_khrplatform.h */, + D45A39381CF3007A00659A24 /* SDL_opengles2.h */, D45A393D1CF3007A00659A24 /* SDL_pixels.h */, D45A393E1CF3007A00659A24 /* SDL_platform.h */, D45A393F1CF3007A00659A24 /* SDL_power.h */, @@ -1785,6 +1784,7 @@ D45A394F1CF3007A00659A24 /* SDL_types.h */, D45A39501CF3007A00659A24 /* SDL_version.h */, D45A39511CF3007A00659A24 /* SDL_video.h */, + D45A39191CF3007A00659A24 /* SDL.h */, ); path = SDL2; sourceTree = ""; @@ -1855,12 +1855,12 @@ D4EC48811C2634870024B507 /* include */ = { isa = PBXGroup; children = ( - D45A38C41CF3007A00659A24 /* jansson_config.h */, - D45A38C51CF3007A00659A24 /* jansson.h */, D45A38C61CF3007A00659A24 /* libpng16 */, D45A38CA1CF3007A00659A24 /* openssl */, D45A39161CF3007A00659A24 /* SDL2 */, D45A39521CF3007A00659A24 /* speex */, + D45A38C41CF3007A00659A24 /* jansson_config.h */, + D45A38C51CF3007A00659A24 /* jansson.h */, ); path = include; sourceTree = "";