[arch-commits] Commit in simutrans/repos/community-x86_64 (15 files)
Balló György
bgyorgy at archlinux.org
Sun Dec 30 01:19:17 UTC 2018
Date: Sunday, December 30, 2018 @ 01:19:16
Author: bgyorgy
Revision: 418954
archrelease: copy trunk to community-x86_64
Added:
simutrans/repos/community-x86_64/Makefile
(from rev 418953, simutrans/trunk/Makefile)
simutrans/repos/community-x86_64/PKGBUILD
(from rev 418953, simutrans/trunk/PKGBUILD)
simutrans/repos/community-x86_64/common.mk
(from rev 418953, simutrans/trunk/common.mk)
simutrans/repos/community-x86_64/config.patch
(from rev 418953, simutrans/trunk/config.patch)
simutrans/repos/community-x86_64/path-for-game-data.patch
(from rev 418953, simutrans/trunk/path-for-game-data.patch)
simutrans/repos/community-x86_64/settings-folder.patch
(from rev 418953, simutrans/trunk/settings-folder.patch)
simutrans/repos/community-x86_64/simutrans.appdata.xml
(from rev 418953, simutrans/trunk/simutrans.appdata.xml)
simutrans/repos/community-x86_64/simutrans.desktop
(from rev 418953, simutrans/trunk/simutrans.desktop)
Deleted:
simutrans/repos/community-x86_64/Makefile
simutrans/repos/community-x86_64/PKGBUILD
simutrans/repos/community-x86_64/common.mk
simutrans/repos/community-x86_64/config.patch
simutrans/repos/community-x86_64/path-for-game-data.patch
simutrans/repos/community-x86_64/settings-folder.patch
simutrans/repos/community-x86_64/simutrans.desktop
--------------------------+
Makefile | 1440 ++++++++++++++++++++++-----------------------
PKGBUILD | 134 ++--
common.mk | 112 +--
config.patch | 66 +-
path-for-game-data.patch | 36 -
settings-folder.patch | 24
simutrans.appdata.xml | 19
simutrans.desktop | 18
8 files changed, 936 insertions(+), 913 deletions(-)
Deleted: Makefile
===================================================================
--- Makefile 2018-12-30 01:18:55 UTC (rev 418953)
+++ Makefile 2018-12-30 01:19:16 UTC (rev 418954)
@@ -1,720 +0,0 @@
-CFG ?= default
--include config.$(CFG)
-
-HOSTCC?=$(CC)
-HOSTCXX?=$(CXX)
-
-PROFILE ?= 0
-STATIC ?= 0
-AV_FOUNDATION ?= 0
-
-ALLEGRO_CONFIG ?= allegro-config
-SDL_CONFIG ?= sdl-config
-SDL2_CONFIG ?= sdl2-config
-FREETYPE_CONFIG ?= freetype-config
-
-BACKENDS = allegro gdi opengl sdl sdl2 mixer_sdl mixer_sdl2 posix
-COLOUR_DEPTHS = 0 16
-OSTYPES = amiga beos freebsd haiku linux mingw mac openbsd
-
-ifeq ($(findstring $(BACKEND), $(BACKENDS)),)
- $(error Unkown BACKEND "$(BACKEND)", must be one of "$(BACKENDS)")
-endif
-
-ifeq ($(findstring $(COLOUR_DEPTH), $(COLOUR_DEPTHS)),)
- $(error Unkown COLOUR_DEPTH "$(COLOUR_DEPTH)", must be one of "$(COLOUR_DEPTHS)")
-endif
-
-ifeq ($(findstring $(OSTYPE), $(OSTYPES)),)
- $(error Unkown OSTYPE "$(OSTYPE)", must be one of "$(OSTYPES)")
-endif
-
-ifeq ($(OSTYPE),amiga)
- STD_LIBS ?= -lunix -lSDL_mixer -lsmpeg -lvorbisfile -lvorbis -logg
- CFLAGS += -mcrt=newlib -DSIM_BIG_ENDIAN -gstabs+
- LDFLAGS += -Bstatic -non_shared
-else
- # BeOS (obsolete)
- ifeq ($(OSTYPE),beos)
- LIBS += -lnet
- else
- ifeq ($(OSTYPE),mingw)
- CFLAGS += -DPNG_STATIC -DZLIB_STATIC
- ifeq ($(shell expr $(STATIC) \>= 1), 1)
- CFLAGS += -static
- LDFLAGS += -static-libgcc -static-libstdc++ -static
- endif
- LDFLAGS += -pthread -Wl,--large-address-aware
- SOURCES += simsys_w32_png.cc
- CFLAGS += -DNOMINMAX -DWIN32_LEAN_AND_MEAN -DWINVER=0x0501 -D_WIN32_IE=0x0500
- LIBS += -lmingw32 -lgdi32 -lwinmm -lws2_32 -limm32
- # Disable the console on Windows unless WIN32_CONSOLE is set or graphics are disabled
- ifdef WIN32_CONSOLE
- ifeq ($(shell expr $(WIN32_CONSOLE) \>= 1), 1)
- LDFLAGS += -mconsole
- endif
- else
- ifeq ($(BACKEND),posix)
- LDFLAGS += -mconsole
- else
- LDFLAGS += -mwindows
- endif
- endif
- else
- # Haiku (needs to activate the GCC 4x)
- ifeq ($(OSTYPE),haiku)
- LIBS += -lnetwork -lbe
- endif
- endif
- endif
-endif
-
-ifeq ($(OSTYPE),mingw)
- SOURCES += clipboard_w32.cc
-else
- ifeq ($(BACKEND),SDL2)
- SOURCES += clipboard_s.cc
- else
- SOURCES += clipboard_internal.cc
- endif
-endif
-
-LIBS += -lbz2 -lz
-
-ifdef OPTIMISE
- ifeq ($(shell expr $(OPTIMISE) \>= 1), 1)
- CFLAGS += -O3
- ifeq ($(findstring $(OSTYPE), amiga),)
- ifneq ($(findstring $(CXX), clang),)
- CFLAGS += -minline-all-stringops
- endif
- endif
- endif
-else
- CFLAGS += -O
-endif
-
-ifdef DEBUG
- ifndef MSG_LEVEL
- MSG_LEVEL = 3
- endif
- ifeq ($(shell expr $(DEBUG) \>= 1), 1)
- CFLAGS += -g -DDEBUG
- endif
- ifeq ($(shell expr $(DEBUG) \>= 2), 1)
- ifeq ($(shell expr $(PROFILE) \>= 2), 1)
- CFLAGS += -fno-inline
- endif
- endif
- ifeq ($(shell expr $(DEBUG) \>= 3), 1)
- ifeq ($(shell expr $(PROFILE) \>= 2), 1)
- CFLAGS += -O0
- endif
- endif
-else
- CFLAGS += -DNDEBUG
-endif
-
-ifdef MSG_LEVEL
- CFLAGS += -DMSG_LEVEL=$(MSG_LEVEL)
-endif
-
-ifdef USE_FREETYPE
- ifeq ($(shell expr $(USE_FREETYPE) \>= 1), 1)
- CFLAGS += -DUSE_FREETYPE
- ifneq ($(FREETYPE_CONFIG),)
- CFLAGS += $(shell $(FREETYPE_CONFIG) --cflags)
- ifeq ($(shell expr $(STATIC) \>= 1), 1)
- LDFLAGS += $(shell $(FREETYPE_CONFIG) --libs --static)
- else
- LDFLAGS += $(shell $(FREETYPE_CONFIG) --libs)
- endif
- else
- LDFLAGS += -lfreetype
- ifeq ($(OSTYPE),mingw)
- LDFLAGS += -lpng -lharfbuzz -lgraphite2
- endif
- endif
- ifeq ($(OSTYPE),mingw)
- LDFLAGS += -lfreetype
- endif
- endif
-endif
-
-ifdef USE_UPNP
- ifeq ($(shell expr $(USE_UPNP) \>= 1), 1)
- CFLAGS += -DUSE_UPNP
- LDFLAGS += -lminiupnpc
- ifeq ($(OSTYPE),mingw)
- ifeq ($(shell expr $(STATIC) \>= 1), 1)
- LDFLAGS += -Wl,-Bdynamic
- endif
- LDFLAGS += -liphlpapi
- ifeq ($(shell expr $(STATIC) \>= 1), 1)
- LDFLAGS += -Wl,-Bstatic
- endif
- endif
- endif
-endif
-
-ifeq ($(shell expr $(PROFILE) \>= 1), 1)
- CFLAGS += -pg -DPROFILE
- ifeq ($(shell expr $(PROFILE) \>= 2), 1)
- CFLAGS += -fno-inline -fno-schedule-insns
- endif
- LDFLAGS += -pg
-endif
-
-ifdef MULTI_THREAD
- ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1)
- CFLAGS += -DMULTI_THREAD
- ifneq ($(OSTYPE),haiku)
- # mingw has already added pthread statically
- ifneq ($(OSTYPE),mingw)
- LDFLAGS += -lpthread
- endif
- endif
- endif
-endif
-
-ifdef WITH_REVISION
- ifeq ($(shell expr $(WITH_REVISION) \>= 1), 1)
- ifeq ($(shell expr $(WITH_REVISION) \>= 2), 1)
- REV = $(WITH_REVISION)
- else
- REV = $(shell svnversion)
- endif
- ifneq ($(REV),)
- CFLAGS += -DREVISION="$(REV)"
- endif
- endif
-endif
-
-CFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
-CCFLAGS += -ansi -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-
-
-SOURCES += bauer/brueckenbauer.cc
-SOURCES += bauer/fabrikbauer.cc
-SOURCES += bauer/hausbauer.cc
-SOURCES += bauer/tunnelbauer.cc
-SOURCES += bauer/vehikelbauer.cc
-SOURCES += bauer/goods_manager.cc
-SOURCES += bauer/wegbauer.cc
-SOURCES += descriptor/image.cc
-SOURCES += descriptor/bridge_desc.cc
-SOURCES += descriptor/factory_desc.cc
-SOURCES += descriptor/ground_desc.cc
-SOURCES += descriptor/building_desc.cc
-SOURCES += descriptor/obj_base_desc.cc
-SOURCES += descriptor/reader/bridge_reader.cc
-SOURCES += descriptor/reader/building_reader.cc
-SOURCES += descriptor/reader/citycar_reader.cc
-SOURCES += descriptor/reader/crossing_reader.cc
-SOURCES += descriptor/reader/factory_reader.cc
-SOURCES += descriptor/reader/good_reader.cc
-SOURCES += descriptor/reader/ground_reader.cc
-SOURCES += descriptor/reader/groundobj_reader.cc
-SOURCES += descriptor/reader/image_reader.cc
-SOURCES += descriptor/reader/imagelist2d_reader.cc
-SOURCES += descriptor/reader/imagelist_reader.cc
-SOURCES += descriptor/reader/obj_reader.cc
-SOURCES += descriptor/reader/pedestrian_reader.cc
-SOURCES += descriptor/reader/roadsign_reader.cc
-SOURCES += descriptor/reader/root_reader.cc
-SOURCES += descriptor/reader/sim_reader.cc
-SOURCES += descriptor/reader/skin_reader.cc
-SOURCES += descriptor/reader/sound_reader.cc
-SOURCES += descriptor/reader/text_reader.cc
-SOURCES += descriptor/reader/tree_reader.cc
-SOURCES += descriptor/reader/tunnel_reader.cc
-SOURCES += descriptor/reader/vehicle_reader.cc
-SOURCES += descriptor/reader/way_obj_reader.cc
-SOURCES += descriptor/reader/way_reader.cc
-SOURCES += descriptor/reader/xref_reader.cc
-SOURCES += descriptor/sound_desc.cc
-SOURCES += descriptor/tunnel_desc.cc
-SOURCES += descriptor/vehicle_desc.cc
-SOURCES += descriptor/goods_desc.cc
-SOURCES += descriptor/way_desc.cc
-SOURCES += boden/boden.cc
-SOURCES += boden/brueckenboden.cc
-SOURCES += boden/fundament.cc
-SOURCES += boden/grund.cc
-SOURCES += boden/monorailboden.cc
-SOURCES += boden/tunnelboden.cc
-SOURCES += boden/wasser.cc
-SOURCES += boden/wege/kanal.cc
-SOURCES += boden/wege/maglev.cc
-SOURCES += boden/wege/monorail.cc
-SOURCES += boden/wege/narrowgauge.cc
-SOURCES += boden/wege/runway.cc
-SOURCES += boden/wege/schiene.cc
-SOURCES += boden/wege/strasse.cc
-SOURCES += boden/wege/weg.cc
-SOURCES += dataobj/crossing_logic.cc
-SOURCES += dataobj/objlist.cc
-SOURCES += dataobj/settings.cc
-SOURCES += dataobj/freelist.cc
-SOURCES += dataobj/gameinfo.cc
-SOURCES += dataobj/height_map_loader.cc
-SOURCES += dataobj/koord.cc
-SOURCES += dataobj/koord3d.cc
-SOURCES += dataobj/loadsave.cc
-SOURCES += dataobj/marker.cc
-SOURCES += dataobj/powernet.cc
-SOURCES += dataobj/records.cc
-SOURCES += dataobj/rect.cc
-SOURCES += dataobj/ribi.cc
-SOURCES += dataobj/route.cc
-SOURCES += dataobj/scenario.cc
-SOURCES += dataobj/schedule.cc
-SOURCES += dataobj/tabfile.cc
-SOURCES += dataobj/translator.cc
-SOURCES += dataobj/environment.cc
-SOURCES += obj/baum.cc
-SOURCES += obj/bruecke.cc
-SOURCES += obj/crossing.cc
-SOURCES += obj/field.cc
-SOURCES += obj/gebaeude.cc
-SOURCES += obj/groundobj.cc
-SOURCES += obj/label.cc
-SOURCES += obj/leitung2.cc
-SOURCES += obj/pillar.cc
-SOURCES += obj/roadsign.cc
-SOURCES += obj/signal.cc
-SOURCES += obj/tunnel.cc
-SOURCES += obj/wayobj.cc
-SOURCES += obj/wolke.cc
-SOURCES += obj/zeiger.cc
-SOURCES += display/font.cc
-SOURCES += display/simgraph$(COLOUR_DEPTH).cc
-SOURCES += display/simview.cc
-SOURCES += display/viewport.cc
-SOURCES += freight_list_sorter.cc
-SOURCES += gui/ai_option_t.cc
-SOURCES += gui/ai_selector.cc
-SOURCES += gui/banner.cc
-SOURCES += gui/baum_edit.cc
-SOURCES += gui/base_info.cc
-SOURCES += gui/citybuilding_edit.cc
-SOURCES += gui/citylist_frame_t.cc
-SOURCES += gui/citylist_stats_t.cc
-SOURCES += gui/climates.cc
-SOURCES += gui/display_settings.cc
-SOURCES += gui/components/gui_button.cc
-SOURCES += gui/components/gui_chart.cc
-SOURCES += gui/components/gui_combobox.cc
-SOURCES += gui/components/gui_container.cc
-SOURCES += gui/components/gui_convoiinfo.cc
-SOURCES += gui/components/gui_obj_view_t.cc
-SOURCES += gui/components/gui_fixedwidth_textarea.cc
-SOURCES += gui/components/gui_flowtext.cc
-SOURCES += gui/components/gui_image.cc
-SOURCES += gui/components/gui_image_list.cc
-SOURCES += gui/components/gui_komponente.cc
-SOURCES += gui/components/gui_label.cc
-SOURCES += gui/components/gui_map_preview.cc
-SOURCES += gui/components/gui_numberinput.cc
-SOURCES += gui/components/gui_scrollbar.cc
-SOURCES += gui/components/gui_scrolled_list.cc
-SOURCES += gui/components/gui_scrollpane.cc
-SOURCES += gui/components/gui_speedbar.cc
-SOURCES += gui/components/gui_tab_panel.cc
-SOURCES += gui/components/gui_textarea.cc
-SOURCES += gui/components/gui_textinput.cc
-SOURCES += gui/components/gui_world_view_t.cc
-SOURCES += gui/convoi_detail_t.cc
-SOURCES += gui/convoi_filter_frame.cc
-SOURCES += gui/convoi_frame.cc
-SOURCES += gui/convoi_info_t.cc
-SOURCES += gui/convoy_item.cc
-SOURCES += gui/curiosity_edit.cc
-SOURCES += gui/curiositylist_frame_t.cc
-SOURCES += gui/curiositylist_stats_t.cc
-SOURCES += gui/depot_frame.cc
-SOURCES += gui/enlarge_map_frame_t.cc
-SOURCES += gui/extend_edit.cc
-SOURCES += gui/fabrik_info.cc
-SOURCES += gui/factory_chart.cc
-SOURCES += gui/factory_edit.cc
-SOURCES += gui/factorylist_frame_t.cc
-SOURCES += gui/factorylist_stats_t.cc
-SOURCES += gui/goods_frame_t.cc
-SOURCES += gui/goods_stats_t.cc
-SOURCES += gui/ground_info.cc
-SOURCES += gui/gui_frame.cc
-SOURCES += gui/gui_theme.cc
-SOURCES += gui/halt_detail.cc
-SOURCES += gui/halt_info.cc
-SOURCES += gui/halt_list_filter_frame.cc
-SOURCES += gui/halt_list_frame.cc
-SOURCES += gui/halt_list_stats.cc
-SOURCES += gui/help_frame.cc
-SOURCES += gui/jump_frame.cc
-SOURCES += gui/karte.cc
-SOURCES += gui/kennfarbe.cc
-SOURCES += gui/label_info.cc
-SOURCES += gui/labellist_frame_t.cc
-SOURCES += gui/labellist_stats_t.cc
-SOURCES += gui/line_item.cc
-SOURCES += gui/line_management_gui.cc
-SOURCES += gui/load_relief_frame.cc
-SOURCES += gui/loadfont_frame.cc
-SOURCES += gui/loadsave_frame.cc
-SOURCES += gui/map_frame.cc
-SOURCES += gui/message_frame_t.cc
-SOURCES += gui/message_option_t.cc
-SOURCES += gui/message_stats_t.cc
-SOURCES += gui/messagebox.cc
-SOURCES += gui/money_frame.cc
-SOURCES += gui/optionen.cc
-SOURCES += gui/pakselector.cc
-SOURCES += gui/password_frame.cc
-SOURCES += gui/player_frame_t.cc
-SOURCES += gui/privatesign_info.cc
-SOURCES += gui/savegame_frame.cc
-SOURCES += gui/scenario_frame.cc
-SOURCES += gui/scenario_info.cc
-SOURCES += gui/schedule_gui.cc
-SOURCES += gui/schedule_list.cc
-SOURCES += gui/server_frame.cc
-SOURCES += gui/settings_frame.cc
-SOURCES += gui/settings_stats.cc
-SOURCES += gui/signal_spacing.cc
-SOURCES += gui/simwin.cc
-SOURCES += gui/sound_frame.cc
-SOURCES += gui/sprachen.cc
-SOURCES += gui/city_info.cc
-SOURCES += gui/station_building_select.cc
-SOURCES += gui/themeselector.cc
-SOURCES += gui/tool_selector.cc
-SOURCES += gui/trafficlight_info.cc
-SOURCES += gui/obj_info.cc
-SOURCES += gui/welt.cc
-SOURCES += network/checksum.cc
-SOURCES += network/memory_rw.cc
-SOURCES += network/network.cc
-SOURCES += network/network_address.cc
-SOURCES += network/network_cmd.cc
-SOURCES += network/network_cmd_ingame.cc
-SOURCES += network/network_cmd_scenario.cc
-SOURCES += network/network_cmp_pakset.cc
-SOURCES += network/network_file_transfer.cc
-SOURCES += network/network_packet.cc
-SOURCES += network/network_socket_list.cc
-SOURCES += network/pakset_info.cc
-SOURCES += network/pwd_hash.cc
-SOURCES += old_blockmanager.cc
-SOURCES += player/ai.cc
-SOURCES += player/ai_goods.cc
-SOURCES += player/ai_passenger.cc
-SOURCES += player/ai_scripted.cc
-SOURCES += player/finance.cc
-SOURCES += player/simplay.cc
-SOURCES += script/api_class.cc
-SOURCES += script/api_function.cc
-SOURCES += script/api_param.cc
-SOURCES += script/api/api_city.cc
-SOURCES += script/api/api_command.cc
-SOURCES += script/api/api_const.cc
-SOURCES += script/api/api_control.cc
-SOURCES += script/api/api_convoy.cc
-SOURCES += script/api/api_gui.cc
-SOURCES += script/api/api_factory.cc
-SOURCES += script/api/api_halt.cc
-SOURCES += script/api/api_include.cc
-SOURCES += script/api/api_line.cc
-SOURCES += script/api/api_map_objects.cc
-SOURCES += script/api/api_obj_desc.cc
-SOURCES += script/api/api_obj_desc_base.cc
-SOURCES += script/api/api_pathfinding.cc
-SOURCES += script/api/api_player.cc
-SOURCES += script/api/api_scenario.cc
-SOURCES += script/api/api_schedule.cc
-SOURCES += script/api/api_settings.cc
-SOURCES += script/api/api_simple.cc
-SOURCES += script/api/api_tiles.cc
-SOURCES += script/api/api_world.cc
-SOURCES += script/api/export_desc.cc
-SOURCES += script/api/get_next.cc
-SOURCES += script/dynamic_string.cc
-SOURCES += script/export_objs.cc
-SOURCES += script/script.cc
-SOURCES += squirrel/sq_extensions.cc
-SOURCES += squirrel/squirrel/sqapi.cc
-SOURCES += squirrel/squirrel/sqclass.cc
-SOURCES += squirrel/squirrel/sqdebug.cc
-SOURCES += squirrel/squirrel/sqlexer.cc
-SOURCES += squirrel/squirrel/sqobject.cc
-SOURCES += squirrel/squirrel/sqtable.cc
-SOURCES += squirrel/squirrel/sqbaselib.cc
-SOURCES += squirrel/squirrel/sqcompiler.cc
-SOURCES += squirrel/squirrel/sqfuncstate.cc
-SOURCES += squirrel/squirrel/sqmem.cc
-SOURCES += squirrel/squirrel/sqstate.cc
-SOURCES += squirrel/squirrel/sqvm.cc
-SOURCES += squirrel/sqstdlib/sqstdaux.cc
-SOURCES += squirrel/sqstdlib/sqstdio.cc
-SOURCES += squirrel/sqstdlib/sqstdrex.cc
-SOURCES += squirrel/sqstdlib/sqstdstring.cc
-SOURCES += squirrel/sqstdlib/sqstdblob.cc
-SOURCES += squirrel/sqstdlib/sqstdmath.cc
-SOURCES += squirrel/sqstdlib/sqstdstream.cc
-SOURCES += squirrel/sqstdlib/sqstdsystem.cc
-SOURCES += simcity.cc
-SOURCES += simconvoi.cc
-SOURCES += simdebug.cc
-SOURCES += simdepot.cc
-SOURCES += simobj.cc
-SOURCES += simevent.cc
-SOURCES += simfab.cc
-SOURCES += simhalt.cc
-SOURCES += siminteraction.cc
-SOURCES += simintr.cc
-SOURCES += simio.cc
-SOURCES += simline.cc
-SOURCES += simlinemgmt.cc
-SOURCES += simloadingscreen.cc
-SOURCES += simmain.cc
-SOURCES += simmem.cc
-SOURCES += simmenu.cc
-SOURCES += simmesg.cc
-SOURCES += simplan.cc
-SOURCES += simskin.cc
-SOURCES += simsound.cc
-SOURCES += simsys.cc
-SOURCES += simticker.cc
-SOURCES += simtool.cc
-SOURCES += simware.cc
-SOURCES += simworld.cc
-SOURCES += finder/placefinder.cc
-SOURCES += unicode.cc
-SOURCES += utils/cbuffer_t.cc
-SOURCES += utils/csv.cc
-SOURCES += utils/log.cc
-SOURCES += utils/searchfolder.cc
-SOURCES += utils/sha1.cc
-SOURCES += utils/simrandom.cc
-SOURCES += utils/simstring.cc
-SOURCES += utils/simthread.cc
-SOURCES += vehicle/movingobj.cc
-SOURCES += vehicle/simpeople.cc
-SOURCES += vehicle/simvehicle.cc
-SOURCES += vehicle/simroadtraffic.cc
-
-
-ifeq ($(BACKEND),allegro)
- SOURCES += simsys_d.cc
- SOURCES += sound/allegro_sound.cc
- SOURCES += music/allegro_midi.cc
- ifeq ($(ALLEGRO_CONFIG),)
- ALLEGRO_CFLAGS :=
- ALLEGRO_LDFLAGS := -lalleg
- else
- ALLEGRO_CFLAGS := $(shell $(ALLEGRO_CONFIG) --cflags)
- ALLEGRO_LDFLAGS := $(shell $(ALLEGRO_CONFIG) --libs)
- endif
- CFLAGS += $(ALLEGRO_CFLAGS) -DUSE_SOFTPOINTER
- LIBS += $(ALLEGRO_LDFLAGS)
-endif
-
-ifeq ($(BACKEND),gdi)
- SOURCES += simsys_w.cc
- SOURCES += music/w32_midi.cc
- SOURCES += sound/win32_sound.cc
-endif
-
-ifeq ($(BACKEND),sdl)
- SOURCES += simsys_s.cc
- ifeq ($(OSTYPE),mac)
- ifeq ($(shell expr $(AV_FOUNDATION) \>= 1), 1)
- # Core Audio (AVFoundation) base sound system routines
- SOURCES += sound/AVF_core-audio_sound.mm
- SOURCES += music/AVF_core-audio_midi.mm
- LIBS += -framework Foundation -framework AVFoundation
- else
- # Core Audio (Quicktime) base sound system routines
- SOURCES += sound/core-audio_sound.mm
- SOURCES += music/core-audio_midi.mm
- LIBS += -framework Foundation -framework QTKit
- endif
- else
- SOURCES += sound/sdl_sound.cc
- ifneq ($(OSTYPE),mingw)
- SOURCES += music/no_midi.cc
- else
- SOURCES += music/w32_midi.cc
- endif
- endif
- ifeq ($(SDL_CONFIG),)
- ifeq ($(OSTYPE),mac)
- SDL_CFLAGS := -I/Library/Frameworks/SDL.framework/Headers -Dmain=SDL_main
- SDL_LDFLAGS := -framework SDL -framework Cocoa -I/Library/Frameworks/SDL.framework/Headers OSX/SDLMain.m
- else
- SDL_CFLAGS := -I$(MINGDIR)/include/SDL -Dmain=SDL_main
- SDL_LDFLAGS := -lSDLmain -lSDL
- endif
- else
- SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
- ifeq ($(shell expr $(STATIC) \>= 1), 1)
- SDL_LDFLAGS := $(shell $(SDL_CONFIG) --static-libs)
- else
- SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
- endif
- endif
- CFLAGS += $(SDL_CFLAGS)
- LIBS += $(SDL_LDFLAGS)
-endif
-
-ifeq ($(BACKEND),sdl2)
- SOURCES += simsys_s2.cc
- ifeq ($(OSTYPE),mac)
- ifeq ($(shell expr $(AV_FOUNDATION) \>= 1), 1)
- # Core Audio (AVFoundation) base sound system routines
- SOURCES += sound/AVF_core-audio_sound.mm
- SOURCES += music/AVF_core-audio_midi.mm
- LIBS += -framework Foundation -framework AVFoundation
- else
- # Core Audio (Quicktime) base sound system routines
- SOURCES += sound/core-audio_sound.mm
- SOURCES += music/core-audio_midi.mm
- LIBS += -framework Foundation -framework QTKit
- endif
- else
- SOURCES += sound/sdl2_sound.cc
- ifneq ($(OSTYPE),mingw)
- SOURCES += music/no_midi.cc
- else
- SOURCES += music/w32_midi.cc
- endif
- endif
- ifeq ($(SDL2_CONFIG),)
- ifeq ($(OSTYPE),mac)
- SDL_CFLAGS := -I/Library/Frameworks/SDL2.framework/Headers
- SDL_LDFLAGS := -framework SDL2
- else
- SDL_CFLAGS := -I$(MINGDIR)/include/SDL2 -Dmain=SDL_main
- SDL_LDFLAGS := -lSDL2main -lSDL2
- endif
- else
- SDL_CFLAGS := $(shell $(SDL2_CONFIG) --cflags)
- ifeq ($(shell expr $(STATIC) \>= 1), 1)
- SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --static-libs)
- else
- SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --libs)
- endif
- endif
- CFLAGS += $(SDL_CFLAGS)
- LIBS += $(SDL_LDFLAGS)
-endif
-
-ifeq ($(BACKEND),mixer_sdl2)
- SOURCES += simsys_s2.cc
- ifeq ($(SDL2_CONFIG),)
- ifeq ($(OSTYPE),mac)
- SDL_CFLAGS := -I/Library/Frameworks/SDL2.framework/Headers
- SDL_LDFLAGS := -framework SDL2
- else
- SDL_CFLAGS := -I$(MINGDIR)/include/SDL2 -Dmain=SDL_main
- SDL_LDFLAGS := -lSDL2main -lSDL2
- endif
- else
- SOURCES += sound/sdl_mixer_sound.cc
- SOURCES += music/sdl_midi.cc
- SDL_CFLAGS := $(shell $(SDL2_CONFIG) --cflags)
- ifeq ($(shell expr $(STATIC) \>= 1), 1)
- SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --static-libs)
- else
- SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --libs)
- endif
- endif
- CFLAGS += $(SDL_CFLAGS)
- LIBS += $(SDL_LDFLAGS) -lSDL2_mixer
-endif
-
-ifeq ($(BACKEND),mixer_sdl)
- SOURCES += simsys_s.cc
- SOURCES += sound/sdl_mixer_sound.cc
- SOURCES += music/sdl_midi.cc
- ifeq ($(SDL_CONFIG),)
- SDL_CFLAGS := -I$(MINGDIR)/include/SDL -Dmain=SDL_main
- SDL_LDFLAGS := -lmingw32 -lSDLmain -lSDL
- else
- SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
- SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
- endif
- CFLAGS += $(SDL_CFLAGS)
- LIBS += $(SDL_LDFLAGS) -lSDL_mixer
-endif
-
-ifeq ($(BACKEND),opengl)
- SOURCES += simsys_opengl.cc
- ifeq ($(OSTYPE),mac)
- ifeq ($(shell expr $(AV_FOUNDATION) \>= 1), 1)
- # Core Audio (AVFoundation) base sound system routines
- SOURCES += sound/AVF_core-audio_sound.mm
- SOURCES += music/AVF_core-audio_midi.mm
- LIBS += -framework Foundation -framework AVFoundation
- else
- # Core Audio (Quicktime) base sound system routines
- SOURCES += sound/core-audio_sound.mm
- SOURCES += music/core-audio_midi.mm
- LIBS += -framework Foundation -framework QTKit
- endif
- else
- SOURCES += sound/sdl_sound.cc
- ifneq ($(OSTYPE),mingw)
- SOURCES += music/no_midi.cc
- else
- SOURCES += music/w32_midi.cc
- endif
- endif
- ifeq ($(SDL_CONFIG),)
- SDL_CFLAGS := -I$(MINGDIR)/include/SDL -Dmain=SDL_main
- SDL_LDFLAGS := -lmingw32 -lSDLmain -lSDL
- else
- SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
- SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
- endif
- CFLAGS += $(SDL_CFLAGS)
- LIBS += $(SDL_LDFLAGS) -lglew32
- ifeq ($(OSTYPE),mingw)
- LIBS += -lopengl32
- else
- LIBS += -lGL
- endif
-endif
-
-ifeq ($(BACKEND),posix)
- SOURCES += simsys_posix.cc
- SOURCES += music/no_midi.cc
- SOURCES += sound/no_sound.cc
-endif
-
-CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
-
-ifeq ($(OSTYPE),mingw)
- SOURCES += simres.rc
- WINDRES ?= windres
-endif
-
-CCFLAGS += $(CFLAGS)
-CXXFLAGS += $(CFLAGS)
-
-BUILDDIR ?= build/$(CFG)
-PROGDIR ?= $(BUILDDIR)
-PROG ?= sim
-
-
-include common.mk
-
-ifeq ($(OSTYPE),mac)
- include OSX/osx.mk
-endif
-
-
-.PHONY: makeobj
-
-makeobj:
- $(Q)$(MAKE) -e -C makeobj FLAGS="$(FLAGS)"
Copied: simutrans/repos/community-x86_64/Makefile (from rev 418953, simutrans/trunk/Makefile)
===================================================================
--- Makefile (rev 0)
+++ Makefile 2018-12-30 01:19:16 UTC (rev 418954)
@@ -0,0 +1,720 @@
+CFG ?= default
+-include config.$(CFG)
+
+HOSTCC?=$(CC)
+HOSTCXX?=$(CXX)
+
+PROFILE ?= 0
+STATIC ?= 0
+AV_FOUNDATION ?= 0
+
+ALLEGRO_CONFIG ?= allegro-config
+SDL_CONFIG ?= sdl-config
+SDL2_CONFIG ?= sdl2-config
+FREETYPE_CONFIG ?= freetype-config
+
+BACKENDS = allegro gdi opengl sdl sdl2 mixer_sdl mixer_sdl2 posix
+COLOUR_DEPTHS = 0 16
+OSTYPES = amiga beos freebsd haiku linux mingw mac openbsd
+
+ifeq ($(findstring $(BACKEND), $(BACKENDS)),)
+ $(error Unkown BACKEND "$(BACKEND)", must be one of "$(BACKENDS)")
+endif
+
+ifeq ($(findstring $(COLOUR_DEPTH), $(COLOUR_DEPTHS)),)
+ $(error Unkown COLOUR_DEPTH "$(COLOUR_DEPTH)", must be one of "$(COLOUR_DEPTHS)")
+endif
+
+ifeq ($(findstring $(OSTYPE), $(OSTYPES)),)
+ $(error Unkown OSTYPE "$(OSTYPE)", must be one of "$(OSTYPES)")
+endif
+
+ifeq ($(OSTYPE),amiga)
+ STD_LIBS ?= -lunix -lSDL_mixer -lsmpeg -lvorbisfile -lvorbis -logg
+ CFLAGS += -mcrt=newlib -DSIM_BIG_ENDIAN -gstabs+
+ LDFLAGS += -Bstatic -non_shared
+else
+ # BeOS (obsolete)
+ ifeq ($(OSTYPE),beos)
+ LIBS += -lnet
+ else
+ ifeq ($(OSTYPE),mingw)
+ CFLAGS += -DPNG_STATIC -DZLIB_STATIC
+ ifeq ($(shell expr $(STATIC) \>= 1), 1)
+ CFLAGS += -static
+ LDFLAGS += -static-libgcc -static-libstdc++ -static
+ endif
+ LDFLAGS += -pthread -Wl,--large-address-aware
+ SOURCES += simsys_w32_png.cc
+ CFLAGS += -DNOMINMAX -DWIN32_LEAN_AND_MEAN -DWINVER=0x0501 -D_WIN32_IE=0x0500
+ LIBS += -lmingw32 -lgdi32 -lwinmm -lws2_32 -limm32
+ # Disable the console on Windows unless WIN32_CONSOLE is set or graphics are disabled
+ ifdef WIN32_CONSOLE
+ ifeq ($(shell expr $(WIN32_CONSOLE) \>= 1), 1)
+ LDFLAGS += -mconsole
+ endif
+ else
+ ifeq ($(BACKEND),posix)
+ LDFLAGS += -mconsole
+ else
+ LDFLAGS += -mwindows
+ endif
+ endif
+ else
+ # Haiku (needs to activate the GCC 4x)
+ ifeq ($(OSTYPE),haiku)
+ LIBS += -lnetwork -lbe
+ endif
+ endif
+ endif
+endif
+
+ifeq ($(OSTYPE),mingw)
+ SOURCES += clipboard_w32.cc
+else
+ ifeq ($(BACKEND),SDL2)
+ SOURCES += clipboard_s.cc
+ else
+ SOURCES += clipboard_internal.cc
+ endif
+endif
+
+LIBS += -lbz2 -lz
+
+ifdef OPTIMISE
+ ifeq ($(shell expr $(OPTIMISE) \>= 1), 1)
+ CFLAGS += -O3
+ ifeq ($(findstring $(OSTYPE), amiga),)
+ ifneq ($(findstring $(CXX), clang),)
+ CFLAGS += -minline-all-stringops
+ endif
+ endif
+ endif
+else
+ CFLAGS += -O
+endif
+
+ifdef DEBUG
+ ifndef MSG_LEVEL
+ MSG_LEVEL = 3
+ endif
+ ifeq ($(shell expr $(DEBUG) \>= 1), 1)
+ CFLAGS += -g -DDEBUG
+ endif
+ ifeq ($(shell expr $(DEBUG) \>= 2), 1)
+ ifeq ($(shell expr $(PROFILE) \>= 2), 1)
+ CFLAGS += -fno-inline
+ endif
+ endif
+ ifeq ($(shell expr $(DEBUG) \>= 3), 1)
+ ifeq ($(shell expr $(PROFILE) \>= 2), 1)
+ CFLAGS += -O0
+ endif
+ endif
+else
+ CFLAGS += -DNDEBUG
+endif
+
+ifdef MSG_LEVEL
+ CFLAGS += -DMSG_LEVEL=$(MSG_LEVEL)
+endif
+
+ifdef USE_FREETYPE
+ ifeq ($(shell expr $(USE_FREETYPE) \>= 1), 1)
+ CFLAGS += -DUSE_FREETYPE
+ ifneq ($(FREETYPE_CONFIG),)
+ CFLAGS += $(shell $(FREETYPE_CONFIG) --cflags)
+ ifeq ($(shell expr $(STATIC) \>= 1), 1)
+ LDFLAGS += $(shell $(FREETYPE_CONFIG) --libs --static)
+ else
+ LDFLAGS += $(shell $(FREETYPE_CONFIG) --libs)
+ endif
+ else
+ LDFLAGS += -lfreetype
+ ifeq ($(OSTYPE),mingw)
+ LDFLAGS += -lpng -lharfbuzz -lgraphite2
+ endif
+ endif
+ ifeq ($(OSTYPE),mingw)
+ LDFLAGS += -lfreetype
+ endif
+ endif
+endif
+
+ifdef USE_UPNP
+ ifeq ($(shell expr $(USE_UPNP) \>= 1), 1)
+ CFLAGS += -DUSE_UPNP
+ LDFLAGS += -lminiupnpc
+ ifeq ($(OSTYPE),mingw)
+ ifeq ($(shell expr $(STATIC) \>= 1), 1)
+ LDFLAGS += -Wl,-Bdynamic
+ endif
+ LDFLAGS += -liphlpapi
+ ifeq ($(shell expr $(STATIC) \>= 1), 1)
+ LDFLAGS += -Wl,-Bstatic
+ endif
+ endif
+ endif
+endif
+
+ifeq ($(shell expr $(PROFILE) \>= 1), 1)
+ CFLAGS += -pg -DPROFILE
+ ifeq ($(shell expr $(PROFILE) \>= 2), 1)
+ CFLAGS += -fno-inline -fno-schedule-insns
+ endif
+ LDFLAGS += -pg
+endif
+
+ifdef MULTI_THREAD
+ ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1)
+ CFLAGS += -DMULTI_THREAD
+ ifneq ($(OSTYPE),haiku)
+ # mingw has already added pthread statically
+ ifneq ($(OSTYPE),mingw)
+ LDFLAGS += -lpthread
+ endif
+ endif
+ endif
+endif
+
+ifdef WITH_REVISION
+ ifeq ($(shell expr $(WITH_REVISION) \>= 1), 1)
+ ifeq ($(shell expr $(WITH_REVISION) \>= 2), 1)
+ REV = $(WITH_REVISION)
+ else
+ REV = $(shell svnversion)
+ endif
+ ifneq ($(REV),)
+ CFLAGS += -DREVISION="$(REV)"
+ endif
+ endif
+endif
+
+CFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
+CCFLAGS += -ansi -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+
+
+SOURCES += bauer/brueckenbauer.cc
+SOURCES += bauer/fabrikbauer.cc
+SOURCES += bauer/hausbauer.cc
+SOURCES += bauer/tunnelbauer.cc
+SOURCES += bauer/vehikelbauer.cc
+SOURCES += bauer/goods_manager.cc
+SOURCES += bauer/wegbauer.cc
+SOURCES += descriptor/image.cc
+SOURCES += descriptor/bridge_desc.cc
+SOURCES += descriptor/factory_desc.cc
+SOURCES += descriptor/ground_desc.cc
+SOURCES += descriptor/building_desc.cc
+SOURCES += descriptor/obj_base_desc.cc
+SOURCES += descriptor/reader/bridge_reader.cc
+SOURCES += descriptor/reader/building_reader.cc
+SOURCES += descriptor/reader/citycar_reader.cc
+SOURCES += descriptor/reader/crossing_reader.cc
+SOURCES += descriptor/reader/factory_reader.cc
+SOURCES += descriptor/reader/good_reader.cc
+SOURCES += descriptor/reader/ground_reader.cc
+SOURCES += descriptor/reader/groundobj_reader.cc
+SOURCES += descriptor/reader/image_reader.cc
+SOURCES += descriptor/reader/imagelist2d_reader.cc
+SOURCES += descriptor/reader/imagelist_reader.cc
+SOURCES += descriptor/reader/obj_reader.cc
+SOURCES += descriptor/reader/pedestrian_reader.cc
+SOURCES += descriptor/reader/roadsign_reader.cc
+SOURCES += descriptor/reader/root_reader.cc
+SOURCES += descriptor/reader/sim_reader.cc
+SOURCES += descriptor/reader/skin_reader.cc
+SOURCES += descriptor/reader/sound_reader.cc
+SOURCES += descriptor/reader/text_reader.cc
+SOURCES += descriptor/reader/tree_reader.cc
+SOURCES += descriptor/reader/tunnel_reader.cc
+SOURCES += descriptor/reader/vehicle_reader.cc
+SOURCES += descriptor/reader/way_obj_reader.cc
+SOURCES += descriptor/reader/way_reader.cc
+SOURCES += descriptor/reader/xref_reader.cc
+SOURCES += descriptor/sound_desc.cc
+SOURCES += descriptor/tunnel_desc.cc
+SOURCES += descriptor/vehicle_desc.cc
+SOURCES += descriptor/goods_desc.cc
+SOURCES += descriptor/way_desc.cc
+SOURCES += boden/boden.cc
+SOURCES += boden/brueckenboden.cc
+SOURCES += boden/fundament.cc
+SOURCES += boden/grund.cc
+SOURCES += boden/monorailboden.cc
+SOURCES += boden/tunnelboden.cc
+SOURCES += boden/wasser.cc
+SOURCES += boden/wege/kanal.cc
+SOURCES += boden/wege/maglev.cc
+SOURCES += boden/wege/monorail.cc
+SOURCES += boden/wege/narrowgauge.cc
+SOURCES += boden/wege/runway.cc
+SOURCES += boden/wege/schiene.cc
+SOURCES += boden/wege/strasse.cc
+SOURCES += boden/wege/weg.cc
+SOURCES += dataobj/crossing_logic.cc
+SOURCES += dataobj/objlist.cc
+SOURCES += dataobj/settings.cc
+SOURCES += dataobj/freelist.cc
+SOURCES += dataobj/gameinfo.cc
+SOURCES += dataobj/height_map_loader.cc
+SOURCES += dataobj/koord.cc
+SOURCES += dataobj/koord3d.cc
+SOURCES += dataobj/loadsave.cc
+SOURCES += dataobj/marker.cc
+SOURCES += dataobj/powernet.cc
+SOURCES += dataobj/records.cc
+SOURCES += dataobj/rect.cc
+SOURCES += dataobj/ribi.cc
+SOURCES += dataobj/route.cc
+SOURCES += dataobj/scenario.cc
+SOURCES += dataobj/schedule.cc
+SOURCES += dataobj/tabfile.cc
+SOURCES += dataobj/translator.cc
+SOURCES += dataobj/environment.cc
+SOURCES += obj/baum.cc
+SOURCES += obj/bruecke.cc
+SOURCES += obj/crossing.cc
+SOURCES += obj/field.cc
+SOURCES += obj/gebaeude.cc
+SOURCES += obj/groundobj.cc
+SOURCES += obj/label.cc
+SOURCES += obj/leitung2.cc
+SOURCES += obj/pillar.cc
+SOURCES += obj/roadsign.cc
+SOURCES += obj/signal.cc
+SOURCES += obj/tunnel.cc
+SOURCES += obj/wayobj.cc
+SOURCES += obj/wolke.cc
+SOURCES += obj/zeiger.cc
+SOURCES += display/font.cc
+SOURCES += display/simgraph$(COLOUR_DEPTH).cc
+SOURCES += display/simview.cc
+SOURCES += display/viewport.cc
+SOURCES += freight_list_sorter.cc
+SOURCES += gui/ai_option_t.cc
+SOURCES += gui/ai_selector.cc
+SOURCES += gui/banner.cc
+SOURCES += gui/baum_edit.cc
+SOURCES += gui/base_info.cc
+SOURCES += gui/citybuilding_edit.cc
+SOURCES += gui/citylist_frame_t.cc
+SOURCES += gui/citylist_stats_t.cc
+SOURCES += gui/climates.cc
+SOURCES += gui/display_settings.cc
+SOURCES += gui/components/gui_button.cc
+SOURCES += gui/components/gui_chart.cc
+SOURCES += gui/components/gui_combobox.cc
+SOURCES += gui/components/gui_container.cc
+SOURCES += gui/components/gui_convoiinfo.cc
+SOURCES += gui/components/gui_obj_view_t.cc
+SOURCES += gui/components/gui_fixedwidth_textarea.cc
+SOURCES += gui/components/gui_flowtext.cc
+SOURCES += gui/components/gui_image.cc
+SOURCES += gui/components/gui_image_list.cc
+SOURCES += gui/components/gui_komponente.cc
+SOURCES += gui/components/gui_label.cc
+SOURCES += gui/components/gui_map_preview.cc
+SOURCES += gui/components/gui_numberinput.cc
+SOURCES += gui/components/gui_scrollbar.cc
+SOURCES += gui/components/gui_scrolled_list.cc
+SOURCES += gui/components/gui_scrollpane.cc
+SOURCES += gui/components/gui_speedbar.cc
+SOURCES += gui/components/gui_tab_panel.cc
+SOURCES += gui/components/gui_textarea.cc
+SOURCES += gui/components/gui_textinput.cc
+SOURCES += gui/components/gui_world_view_t.cc
+SOURCES += gui/convoi_detail_t.cc
+SOURCES += gui/convoi_filter_frame.cc
+SOURCES += gui/convoi_frame.cc
+SOURCES += gui/convoi_info_t.cc
+SOURCES += gui/convoy_item.cc
+SOURCES += gui/curiosity_edit.cc
+SOURCES += gui/curiositylist_frame_t.cc
+SOURCES += gui/curiositylist_stats_t.cc
+SOURCES += gui/depot_frame.cc
+SOURCES += gui/enlarge_map_frame_t.cc
+SOURCES += gui/extend_edit.cc
+SOURCES += gui/fabrik_info.cc
+SOURCES += gui/factory_chart.cc
+SOURCES += gui/factory_edit.cc
+SOURCES += gui/factorylist_frame_t.cc
+SOURCES += gui/factorylist_stats_t.cc
+SOURCES += gui/goods_frame_t.cc
+SOURCES += gui/goods_stats_t.cc
+SOURCES += gui/ground_info.cc
+SOURCES += gui/gui_frame.cc
+SOURCES += gui/gui_theme.cc
+SOURCES += gui/halt_detail.cc
+SOURCES += gui/halt_info.cc
+SOURCES += gui/halt_list_filter_frame.cc
+SOURCES += gui/halt_list_frame.cc
+SOURCES += gui/halt_list_stats.cc
+SOURCES += gui/help_frame.cc
+SOURCES += gui/jump_frame.cc
+SOURCES += gui/karte.cc
+SOURCES += gui/kennfarbe.cc
+SOURCES += gui/label_info.cc
+SOURCES += gui/labellist_frame_t.cc
+SOURCES += gui/labellist_stats_t.cc
+SOURCES += gui/line_item.cc
+SOURCES += gui/line_management_gui.cc
+SOURCES += gui/load_relief_frame.cc
+SOURCES += gui/loadfont_frame.cc
+SOURCES += gui/loadsave_frame.cc
+SOURCES += gui/map_frame.cc
+SOURCES += gui/message_frame_t.cc
+SOURCES += gui/message_option_t.cc
+SOURCES += gui/message_stats_t.cc
+SOURCES += gui/messagebox.cc
+SOURCES += gui/money_frame.cc
+SOURCES += gui/optionen.cc
+SOURCES += gui/pakselector.cc
+SOURCES += gui/password_frame.cc
+SOURCES += gui/player_frame_t.cc
+SOURCES += gui/privatesign_info.cc
+SOURCES += gui/savegame_frame.cc
+SOURCES += gui/scenario_frame.cc
+SOURCES += gui/scenario_info.cc
+SOURCES += gui/schedule_gui.cc
+SOURCES += gui/schedule_list.cc
+SOURCES += gui/server_frame.cc
+SOURCES += gui/settings_frame.cc
+SOURCES += gui/settings_stats.cc
+SOURCES += gui/signal_spacing.cc
+SOURCES += gui/simwin.cc
+SOURCES += gui/sound_frame.cc
+SOURCES += gui/sprachen.cc
+SOURCES += gui/city_info.cc
+SOURCES += gui/station_building_select.cc
+SOURCES += gui/themeselector.cc
+SOURCES += gui/tool_selector.cc
+SOURCES += gui/trafficlight_info.cc
+SOURCES += gui/obj_info.cc
+SOURCES += gui/welt.cc
+SOURCES += network/checksum.cc
+SOURCES += network/memory_rw.cc
+SOURCES += network/network.cc
+SOURCES += network/network_address.cc
+SOURCES += network/network_cmd.cc
+SOURCES += network/network_cmd_ingame.cc
+SOURCES += network/network_cmd_scenario.cc
+SOURCES += network/network_cmp_pakset.cc
+SOURCES += network/network_file_transfer.cc
+SOURCES += network/network_packet.cc
+SOURCES += network/network_socket_list.cc
+SOURCES += network/pakset_info.cc
+SOURCES += network/pwd_hash.cc
+SOURCES += old_blockmanager.cc
+SOURCES += player/ai.cc
+SOURCES += player/ai_goods.cc
+SOURCES += player/ai_passenger.cc
+SOURCES += player/ai_scripted.cc
+SOURCES += player/finance.cc
+SOURCES += player/simplay.cc
+SOURCES += script/api_class.cc
+SOURCES += script/api_function.cc
+SOURCES += script/api_param.cc
+SOURCES += script/api/api_city.cc
+SOURCES += script/api/api_command.cc
+SOURCES += script/api/api_const.cc
+SOURCES += script/api/api_control.cc
+SOURCES += script/api/api_convoy.cc
+SOURCES += script/api/api_gui.cc
+SOURCES += script/api/api_factory.cc
+SOURCES += script/api/api_halt.cc
+SOURCES += script/api/api_include.cc
+SOURCES += script/api/api_line.cc
+SOURCES += script/api/api_map_objects.cc
+SOURCES += script/api/api_obj_desc.cc
+SOURCES += script/api/api_obj_desc_base.cc
+SOURCES += script/api/api_pathfinding.cc
+SOURCES += script/api/api_player.cc
+SOURCES += script/api/api_scenario.cc
+SOURCES += script/api/api_schedule.cc
+SOURCES += script/api/api_settings.cc
+SOURCES += script/api/api_simple.cc
+SOURCES += script/api/api_tiles.cc
+SOURCES += script/api/api_world.cc
+SOURCES += script/api/export_desc.cc
+SOURCES += script/api/get_next.cc
+SOURCES += script/dynamic_string.cc
+SOURCES += script/export_objs.cc
+SOURCES += script/script.cc
+SOURCES += squirrel/sq_extensions.cc
+SOURCES += squirrel/squirrel/sqapi.cc
+SOURCES += squirrel/squirrel/sqclass.cc
+SOURCES += squirrel/squirrel/sqdebug.cc
+SOURCES += squirrel/squirrel/sqlexer.cc
+SOURCES += squirrel/squirrel/sqobject.cc
+SOURCES += squirrel/squirrel/sqtable.cc
+SOURCES += squirrel/squirrel/sqbaselib.cc
+SOURCES += squirrel/squirrel/sqcompiler.cc
+SOURCES += squirrel/squirrel/sqfuncstate.cc
+SOURCES += squirrel/squirrel/sqmem.cc
+SOURCES += squirrel/squirrel/sqstate.cc
+SOURCES += squirrel/squirrel/sqvm.cc
+SOURCES += squirrel/sqstdlib/sqstdaux.cc
+SOURCES += squirrel/sqstdlib/sqstdio.cc
+SOURCES += squirrel/sqstdlib/sqstdrex.cc
+SOURCES += squirrel/sqstdlib/sqstdstring.cc
+SOURCES += squirrel/sqstdlib/sqstdblob.cc
+SOURCES += squirrel/sqstdlib/sqstdmath.cc
+SOURCES += squirrel/sqstdlib/sqstdstream.cc
+SOURCES += squirrel/sqstdlib/sqstdsystem.cc
+SOURCES += simcity.cc
+SOURCES += simconvoi.cc
+SOURCES += simdebug.cc
+SOURCES += simdepot.cc
+SOURCES += simobj.cc
+SOURCES += simevent.cc
+SOURCES += simfab.cc
+SOURCES += simhalt.cc
+SOURCES += siminteraction.cc
+SOURCES += simintr.cc
+SOURCES += simio.cc
+SOURCES += simline.cc
+SOURCES += simlinemgmt.cc
+SOURCES += simloadingscreen.cc
+SOURCES += simmain.cc
+SOURCES += simmem.cc
+SOURCES += simmenu.cc
+SOURCES += simmesg.cc
+SOURCES += simplan.cc
+SOURCES += simskin.cc
+SOURCES += simsound.cc
+SOURCES += simsys.cc
+SOURCES += simticker.cc
+SOURCES += simtool.cc
+SOURCES += simware.cc
+SOURCES += simworld.cc
+SOURCES += finder/placefinder.cc
+SOURCES += unicode.cc
+SOURCES += utils/cbuffer_t.cc
+SOURCES += utils/csv.cc
+SOURCES += utils/log.cc
+SOURCES += utils/searchfolder.cc
+SOURCES += utils/sha1.cc
+SOURCES += utils/simrandom.cc
+SOURCES += utils/simstring.cc
+SOURCES += utils/simthread.cc
+SOURCES += vehicle/movingobj.cc
+SOURCES += vehicle/simpeople.cc
+SOURCES += vehicle/simvehicle.cc
+SOURCES += vehicle/simroadtraffic.cc
+
+
+ifeq ($(BACKEND),allegro)
+ SOURCES += simsys_d.cc
+ SOURCES += sound/allegro_sound.cc
+ SOURCES += music/allegro_midi.cc
+ ifeq ($(ALLEGRO_CONFIG),)
+ ALLEGRO_CFLAGS :=
+ ALLEGRO_LDFLAGS := -lalleg
+ else
+ ALLEGRO_CFLAGS := $(shell $(ALLEGRO_CONFIG) --cflags)
+ ALLEGRO_LDFLAGS := $(shell $(ALLEGRO_CONFIG) --libs)
+ endif
+ CFLAGS += $(ALLEGRO_CFLAGS) -DUSE_SOFTPOINTER
+ LIBS += $(ALLEGRO_LDFLAGS)
+endif
+
+ifeq ($(BACKEND),gdi)
+ SOURCES += simsys_w.cc
+ SOURCES += music/w32_midi.cc
+ SOURCES += sound/win32_sound.cc
+endif
+
+ifeq ($(BACKEND),sdl)
+ SOURCES += simsys_s.cc
+ ifeq ($(OSTYPE),mac)
+ ifeq ($(shell expr $(AV_FOUNDATION) \>= 1), 1)
+ # Core Audio (AVFoundation) base sound system routines
+ SOURCES += sound/AVF_core-audio_sound.mm
+ SOURCES += music/AVF_core-audio_midi.mm
+ LIBS += -framework Foundation -framework AVFoundation
+ else
+ # Core Audio (Quicktime) base sound system routines
+ SOURCES += sound/core-audio_sound.mm
+ SOURCES += music/core-audio_midi.mm
+ LIBS += -framework Foundation -framework QTKit
+ endif
+ else
+ SOURCES += sound/sdl_sound.cc
+ ifneq ($(OSTYPE),mingw)
+ SOURCES += music/no_midi.cc
+ else
+ SOURCES += music/w32_midi.cc
+ endif
+ endif
+ ifeq ($(SDL_CONFIG),)
+ ifeq ($(OSTYPE),mac)
+ SDL_CFLAGS := -I/Library/Frameworks/SDL.framework/Headers -Dmain=SDL_main
+ SDL_LDFLAGS := -framework SDL -framework Cocoa -I/Library/Frameworks/SDL.framework/Headers OSX/SDLMain.m
+ else
+ SDL_CFLAGS := -I$(MINGDIR)/include/SDL -Dmain=SDL_main
+ SDL_LDFLAGS := -lSDLmain -lSDL
+ endif
+ else
+ SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
+ ifeq ($(shell expr $(STATIC) \>= 1), 1)
+ SDL_LDFLAGS := $(shell $(SDL_CONFIG) --static-libs)
+ else
+ SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
+ endif
+ endif
+ CFLAGS += $(SDL_CFLAGS)
+ LIBS += $(SDL_LDFLAGS)
+endif
+
+ifeq ($(BACKEND),sdl2)
+ SOURCES += simsys_s2.cc
+ ifeq ($(OSTYPE),mac)
+ ifeq ($(shell expr $(AV_FOUNDATION) \>= 1), 1)
+ # Core Audio (AVFoundation) base sound system routines
+ SOURCES += sound/AVF_core-audio_sound.mm
+ SOURCES += music/AVF_core-audio_midi.mm
+ LIBS += -framework Foundation -framework AVFoundation
+ else
+ # Core Audio (Quicktime) base sound system routines
+ SOURCES += sound/core-audio_sound.mm
+ SOURCES += music/core-audio_midi.mm
+ LIBS += -framework Foundation -framework QTKit
+ endif
+ else
+ SOURCES += sound/sdl2_sound.cc
+ ifneq ($(OSTYPE),mingw)
+ SOURCES += music/no_midi.cc
+ else
+ SOURCES += music/w32_midi.cc
+ endif
+ endif
+ ifeq ($(SDL2_CONFIG),)
+ ifeq ($(OSTYPE),mac)
+ SDL_CFLAGS := -I/Library/Frameworks/SDL2.framework/Headers
+ SDL_LDFLAGS := -framework SDL2
+ else
+ SDL_CFLAGS := -I$(MINGDIR)/include/SDL2 -Dmain=SDL_main
+ SDL_LDFLAGS := -lSDL2main -lSDL2
+ endif
+ else
+ SDL_CFLAGS := $(shell $(SDL2_CONFIG) --cflags)
+ ifeq ($(shell expr $(STATIC) \>= 1), 1)
+ SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --static-libs)
+ else
+ SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --libs)
+ endif
+ endif
+ CFLAGS += $(SDL_CFLAGS)
+ LIBS += $(SDL_LDFLAGS)
+endif
+
+ifeq ($(BACKEND),mixer_sdl2)
+ SOURCES += simsys_s2.cc
+ ifeq ($(SDL2_CONFIG),)
+ ifeq ($(OSTYPE),mac)
+ SDL_CFLAGS := -I/Library/Frameworks/SDL2.framework/Headers
+ SDL_LDFLAGS := -framework SDL2
+ else
+ SDL_CFLAGS := -I$(MINGDIR)/include/SDL2 -Dmain=SDL_main
+ SDL_LDFLAGS := -lSDL2main -lSDL2
+ endif
+ else
+ SOURCES += sound/sdl_mixer_sound.cc
+ SOURCES += music/sdl_midi.cc
+ SDL_CFLAGS := $(shell $(SDL2_CONFIG) --cflags)
+ ifeq ($(shell expr $(STATIC) \>= 1), 1)
+ SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --static-libs)
+ else
+ SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --libs)
+ endif
+ endif
+ CFLAGS += $(SDL_CFLAGS)
+ LIBS += $(SDL_LDFLAGS) -lSDL2_mixer
+endif
+
+ifeq ($(BACKEND),mixer_sdl)
+ SOURCES += simsys_s.cc
+ SOURCES += sound/sdl_mixer_sound.cc
+ SOURCES += music/sdl_midi.cc
+ ifeq ($(SDL_CONFIG),)
+ SDL_CFLAGS := -I$(MINGDIR)/include/SDL -Dmain=SDL_main
+ SDL_LDFLAGS := -lmingw32 -lSDLmain -lSDL
+ else
+ SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
+ SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
+ endif
+ CFLAGS += $(SDL_CFLAGS)
+ LIBS += $(SDL_LDFLAGS) -lSDL_mixer
+endif
+
+ifeq ($(BACKEND),opengl)
+ SOURCES += simsys_opengl.cc
+ ifeq ($(OSTYPE),mac)
+ ifeq ($(shell expr $(AV_FOUNDATION) \>= 1), 1)
+ # Core Audio (AVFoundation) base sound system routines
+ SOURCES += sound/AVF_core-audio_sound.mm
+ SOURCES += music/AVF_core-audio_midi.mm
+ LIBS += -framework Foundation -framework AVFoundation
+ else
+ # Core Audio (Quicktime) base sound system routines
+ SOURCES += sound/core-audio_sound.mm
+ SOURCES += music/core-audio_midi.mm
+ LIBS += -framework Foundation -framework QTKit
+ endif
+ else
+ SOURCES += sound/sdl_sound.cc
+ ifneq ($(OSTYPE),mingw)
+ SOURCES += music/no_midi.cc
+ else
+ SOURCES += music/w32_midi.cc
+ endif
+ endif
+ ifeq ($(SDL_CONFIG),)
+ SDL_CFLAGS := -I$(MINGDIR)/include/SDL -Dmain=SDL_main
+ SDL_LDFLAGS := -lmingw32 -lSDLmain -lSDL
+ else
+ SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
+ SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
+ endif
+ CFLAGS += $(SDL_CFLAGS)
+ LIBS += $(SDL_LDFLAGS) -lglew32
+ ifeq ($(OSTYPE),mingw)
+ LIBS += -lopengl32
+ else
+ LIBS += -lGL
+ endif
+endif
+
+ifeq ($(BACKEND),posix)
+ SOURCES += simsys_posix.cc
+ SOURCES += music/no_midi.cc
+ SOURCES += sound/no_sound.cc
+endif
+
+CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
+
+ifeq ($(OSTYPE),mingw)
+ SOURCES += simres.rc
+ WINDRES ?= windres
+endif
+
+CCFLAGS += $(CFLAGS)
+CXXFLAGS += $(CFLAGS)
+
+BUILDDIR ?= build/$(CFG)
+PROGDIR ?= $(BUILDDIR)
+PROG ?= sim
+
+
+include common.mk
+
+ifeq ($(OSTYPE),mac)
+ include OSX/osx.mk
+endif
+
+
+.PHONY: makeobj
+
+makeobj:
+ $(Q)$(MAKE) -e -C makeobj FLAGS="$(FLAGS)"
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-12-30 01:18:55 UTC (rev 418953)
+++ PKGBUILD 2018-12-30 01:19:16 UTC (rev 418954)
@@ -1,65 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-# Contributor: Gilles Gagniard <gilles at gagniard.org>
-# Contributor: JD Steffen <jd at steffennet dot org>
-
-pkgname=simutrans
-pkgver=120.4.1
-_pkgver=120-4-1
-pkgrel=1
-pkgdesc="Transportation simulation game"
-arch=('x86_64')
-url="https://www.simutrans.com/"
-license=('custom:Artistic')
-depends=('gcc-libs' 'zlib' 'sdl_mixer' 'bzip2' 'simutrans-pak64')
-makedepends=('imagemagick' 'dos2unix')
-optdepends=('timidity++: play MIDI music')
-source=(https://downloads.sourceforge.net/$pkgname/$pkgname-src-$_pkgver.zip
- settings-folder.patch
- path-for-game-data.patch
- config.patch
- Makefile
- common.mk
- simutrans.desktop)
-sha256sums=('2cee0d067b3b72fa3a8b4ff31ad2bf5fc77521e7ba8cf9aa10e07e56b7dc877b'
- 'cbe5d7c7be96e6e7262c1e3b1c16155f5c179609f081e3ee050bbfc277845f71'
- '1a0fc75fe1422404e424c91f5a23301234b2997cb727b4985c98ac1af6a4582a'
- '24bf2b611706c42fd52dc00d61fa2e28f54a614f17e43bc463817406e63eba3a'
- '1107a873273bd0a02dc7877137816d2ca4fbfd403a3443fc244d31c8a611b81b'
- 'd17d3b91a989ddca1735875e8d01c4c39ef318a3490d3f24a05b0713fcb69983'
- '99545152f5e739b7eb028152383fa10d3e3d303c99167e1c6e5a6bd7dcd00fa3')
-
-prepare() {
- # Some files are distributed in DOS format
- find . -type f -exec dos2unix -q '{}' \;
-
- # Adjust paths
- patch -Np0 -i settings-folder.patch
- patch -Np1 -i path-for-game-data.patch
-
- # Configure the build process
- cp config.template config.default
- patch -Np0 -i config.patch
-}
-
-build() {
- convert simutrans.ico +set date:create +set date:modify -alpha on simutrans.png
- make
-}
-
-package() {
- #binary
- install -Dm755 build/default/sim "$pkgdir/usr/bin/simutrans"
-
- #data
- mkdir -p "$pkgdir/usr/share/games"
- cp -r $pkgname "$pkgdir/usr/share/games/"
-
- #desktop file and icon
- install -Dm644 simutrans.png "$pkgdir/usr/share/pixmaps/simutrans.png"
- install -Dm644 simutrans.desktop "$pkgdir/usr/share/applications/simutrans.desktop"
-
- #license
- install -Dm644 simutrans/license.txt "$pkgdir/usr/share/licenses/simutrans/license.txt"
-}
Copied: simutrans/repos/community-x86_64/PKGBUILD (from rev 418953, simutrans/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-12-30 01:19:16 UTC (rev 418954)
@@ -0,0 +1,69 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
+# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Contributor: Gilles Gagniard <gilles at gagniard.org>
+# Contributor: JD Steffen <jd at steffennet dot org>
+
+pkgname=simutrans
+pkgver=120.4.1
+_pkgver=120-4-1
+pkgrel=2
+pkgdesc="Transportation simulation game"
+arch=('x86_64')
+url="https://www.simutrans.com/"
+license=('custom:Artistic')
+depends=('gcc-libs' 'zlib' 'sdl_mixer' 'bzip2' 'simutrans-pak64' 'hicolor-icon-theme')
+makedepends=('dos2unix')
+optdepends=('timidity++: play MIDI music')
+source=(https://downloads.sourceforge.net/$pkgname/$pkgname-src-$_pkgver.zip
+ https://raw.githubusercontent.com/aburch/simutrans/8593f5b1248d03f907a149f7abc41ae6512009e1/simutrans.svg
+ settings-folder.patch
+ path-for-game-data.patch
+ config.patch
+ Makefile
+ common.mk
+ simutrans.desktop
+ simutrans.appdata.xml)
+sha256sums=('2cee0d067b3b72fa3a8b4ff31ad2bf5fc77521e7ba8cf9aa10e07e56b7dc877b'
+ 'c0c2dd5da146f64901b00c6ee67e0818a166b983a81cee7897c4843aa9f21c81'
+ 'cbe5d7c7be96e6e7262c1e3b1c16155f5c179609f081e3ee050bbfc277845f71'
+ '1a0fc75fe1422404e424c91f5a23301234b2997cb727b4985c98ac1af6a4582a'
+ '24bf2b611706c42fd52dc00d61fa2e28f54a614f17e43bc463817406e63eba3a'
+ '1107a873273bd0a02dc7877137816d2ca4fbfd403a3443fc244d31c8a611b81b'
+ 'd17d3b91a989ddca1735875e8d01c4c39ef318a3490d3f24a05b0713fcb69983'
+ '99545152f5e739b7eb028152383fa10d3e3d303c99167e1c6e5a6bd7dcd00fa3'
+ 'f3d2416de0f725d15b18482c20231228791e65ceeeb7305115a8ea6a2e591dd6')
+
+prepare() {
+ # Some files are distributed in DOS format
+ find . -type f -exec dos2unix -q '{}' \;
+
+ # Adjust paths
+ patch -Np0 -i settings-folder.patch
+ patch -Np1 -i path-for-game-data.patch
+
+ # Configure the build process
+ cp config.template config.default
+ patch -Np0 -i config.patch
+}
+
+build() {
+ make
+}
+
+package() {
+ #binary
+ install -Dm755 build/default/sim "$pkgdir/usr/bin/simutrans"
+
+ #data
+ mkdir -p "$pkgdir/usr/share/games"
+ cp -r $pkgname "$pkgdir/usr/share/games/"
+
+ #desktop file and icon
+ install -Dm644 simutrans.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/simutrans.svg"
+ install -Dm644 simutrans.desktop "$pkgdir/usr/share/applications/simutrans.desktop"
+ install -Dm644 simutrans.appdata.xml "$pkgdir/usr/share/metainfo/simutrans.appdata.xml"
+
+ #license
+ install -Dm644 simutrans/license.txt "$pkgdir/usr/share/licenses/simutrans/license.txt"
+}
Deleted: common.mk
===================================================================
--- common.mk 2018-12-30 01:18:55 UTC (rev 418953)
+++ common.mk 2018-12-30 01:19:16 UTC (rev 418954)
@@ -1,56 +0,0 @@
-OBJS := $(patsubst %, $(BUILDDIR)/%.o, $(basename $(SOURCES)))
-DEPS := $(OBJS:%.o=%.d)
-DIRS := $(sort $(dir $(OBJS)))
-
-# Make build directories
-DUMMY := $(shell mkdir -p $(DIRS))
-
-.PHONY: all clean
-
-.SUFFIXES: .rc
-
-ifeq ($(VERBOSE),)
- Q = @
-else
- Q =
-endif
-
-all: $(PROGDIR)/$(PROG)
-
-$(PROGDIR)/$(PROG): $(OBJS)
- @echo "===> LD $@"
- $(Q)$(HOSTCXX) $(OBJS) $(LDFLAGS) $(LIBS) -o $(PROGDIR)/$(PROG)
-
-clean:
- @echo "===> Cleaning up"
- $(Q)rm -f $(OBJS)
- $(Q)rm -f $(DEPS)
- $(Q)rm -f $(PROGDIR)/$(PROG)
- $(Q)rm -fr $(PROGDIR)/$(PROG).app
-
--include $(DEPS)
-
-# Silence stale header dependency errors
-%.h:
- @true
-
-$(BUILDDIR)/%.o: %.mm
- @echo "===> Obj-c OSX $<"
- $(Q)$(HOSTCXX) $(CXXFLAGS) $(OBJCFLAGS) -c -MMD -o $@ $<
-
-$(BUILDDIR)/%.o: %.m
- @echo "===> Obj-c OSX $<"
- $(Q)$(HOSTCXX) $(CXXFLAGS) $(OBJCFLAGS) -c -MMD -o $@ $<
-
-$(BUILDDIR)/%.o: %.c
- @echo "===> HOSTCC $<"
- $(Q)$(HOSTCC) $(CCFLAGS) -c -MMD -o $@ $<
-
-$(BUILDDIR)/%.o: %.cc
- @echo "===> HOSTCXX $<"
- $(Q)$(HOSTCXX) $(CXXFLAGS) -c -MMD -o $@ $<
-
-$(BUILDDIR)/%.o: %.rc
- @echo "===> RES $<"
-# $(Q)$(WINDRES) --preprocessor "$(HOSTCXX) -E -xc -DRC_INVOKED -MMD -MF $(@:%.o=%.d) -MT $@" -O COFF $< $@
- $(Q)$(WINDRES) --preprocessor "$(HOSTCXX) -E -xc -DRC_INVOKED -MMD -MT $@" -O COFF $< $@
Copied: simutrans/repos/community-x86_64/common.mk (from rev 418953, simutrans/trunk/common.mk)
===================================================================
--- common.mk (rev 0)
+++ common.mk 2018-12-30 01:19:16 UTC (rev 418954)
@@ -0,0 +1,56 @@
+OBJS := $(patsubst %, $(BUILDDIR)/%.o, $(basename $(SOURCES)))
+DEPS := $(OBJS:%.o=%.d)
+DIRS := $(sort $(dir $(OBJS)))
+
+# Make build directories
+DUMMY := $(shell mkdir -p $(DIRS))
+
+.PHONY: all clean
+
+.SUFFIXES: .rc
+
+ifeq ($(VERBOSE),)
+ Q = @
+else
+ Q =
+endif
+
+all: $(PROGDIR)/$(PROG)
+
+$(PROGDIR)/$(PROG): $(OBJS)
+ @echo "===> LD $@"
+ $(Q)$(HOSTCXX) $(OBJS) $(LDFLAGS) $(LIBS) -o $(PROGDIR)/$(PROG)
+
+clean:
+ @echo "===> Cleaning up"
+ $(Q)rm -f $(OBJS)
+ $(Q)rm -f $(DEPS)
+ $(Q)rm -f $(PROGDIR)/$(PROG)
+ $(Q)rm -fr $(PROGDIR)/$(PROG).app
+
+-include $(DEPS)
+
+# Silence stale header dependency errors
+%.h:
+ @true
+
+$(BUILDDIR)/%.o: %.mm
+ @echo "===> Obj-c OSX $<"
+ $(Q)$(HOSTCXX) $(CXXFLAGS) $(OBJCFLAGS) -c -MMD -o $@ $<
+
+$(BUILDDIR)/%.o: %.m
+ @echo "===> Obj-c OSX $<"
+ $(Q)$(HOSTCXX) $(CXXFLAGS) $(OBJCFLAGS) -c -MMD -o $@ $<
+
+$(BUILDDIR)/%.o: %.c
+ @echo "===> HOSTCC $<"
+ $(Q)$(HOSTCC) $(CCFLAGS) -c -MMD -o $@ $<
+
+$(BUILDDIR)/%.o: %.cc
+ @echo "===> HOSTCXX $<"
+ $(Q)$(HOSTCXX) $(CXXFLAGS) -c -MMD -o $@ $<
+
+$(BUILDDIR)/%.o: %.rc
+ @echo "===> RES $<"
+# $(Q)$(WINDRES) --preprocessor "$(HOSTCXX) -E -xc -DRC_INVOKED -MMD -MF $(@:%.o=%.d) -MT $@" -O COFF $< $@
+ $(Q)$(WINDRES) --preprocessor "$(HOSTCXX) -E -xc -DRC_INVOKED -MMD -MT $@" -O COFF $< $@
Deleted: config.patch
===================================================================
--- config.patch 2018-12-30 01:18:55 UTC (rev 418953)
+++ config.patch 2018-12-30 01:19:16 UTC (rev 418954)
@@ -1,33 +0,0 @@
---- config.default.orig 2011-11-10 21:48:01.000000000 +0100
-+++ config.default 2011-11-10 21:51:58.383221979 +0100
-@@ -6,18 +6,18 @@
- #BACKEND = opengl
- #BACKEND = sdl
- #BACKEND = sdl2
--#BACKEND = mixer_sdl
-+BACKEND = mixer_sdl
- #BACKEND = posix
-
- #COLOUR_DEPTH = 0
--#COLOUR_DEPTH = 16
-+COLOUR_DEPTH = 16
-
- #OSTYPE = amiga
- #OSTYPE = beos
- #OSTYPE = cygwin
- #OSTYPE = freebsd
- #OSTYPE = haiku
--#OSTYPE = linux
-+OSTYPE = linux
- #OSTYPE = mingw
- #OSTYPE = mac
-
-@@ -37,6 +37,6 @@
- #SDL_CONFIG = sdl-config
- #SDL2_CONFIG = sdl2-config
-
--#VERBOSE = 1
-+VERBOSE = 1
-
- # The following useful conditional compilation flags exist
- #
Copied: simutrans/repos/community-x86_64/config.patch (from rev 418953, simutrans/trunk/config.patch)
===================================================================
--- config.patch (rev 0)
+++ config.patch 2018-12-30 01:19:16 UTC (rev 418954)
@@ -0,0 +1,33 @@
+--- config.default.orig 2011-11-10 21:48:01.000000000 +0100
++++ config.default 2011-11-10 21:51:58.383221979 +0100
+@@ -6,18 +6,18 @@
+ #BACKEND = opengl
+ #BACKEND = sdl
+ #BACKEND = sdl2
+-#BACKEND = mixer_sdl
++BACKEND = mixer_sdl
+ #BACKEND = posix
+
+ #COLOUR_DEPTH = 0
+-#COLOUR_DEPTH = 16
++COLOUR_DEPTH = 16
+
+ #OSTYPE = amiga
+ #OSTYPE = beos
+ #OSTYPE = cygwin
+ #OSTYPE = freebsd
+ #OSTYPE = haiku
+-#OSTYPE = linux
++OSTYPE = linux
+ #OSTYPE = mingw
+ #OSTYPE = mac
+
+@@ -37,6 +37,6 @@
+ #SDL_CONFIG = sdl-config
+ #SDL2_CONFIG = sdl2-config
+
+-#VERBOSE = 1
++VERBOSE = 1
+
+ # The following useful conditional compilation flags exist
+ #
Deleted: path-for-game-data.patch
===================================================================
--- path-for-game-data.patch 2018-12-30 01:18:55 UTC (rev 418953)
+++ path-for-game-data.patch 2018-12-30 01:19:16 UTC (rev 418954)
@@ -1,18 +0,0 @@
-look in /usr/share/games/simutrans for game data
-
- at DPATCH@
-
---- simutrans.orig/simmain.cc
-+++ simutrans/simmain.cc
-@@ -437,8 +437,9 @@
- strcat( env_t::program_dir, PATH_SEPARATOR );
- }
- else {
-- strcpy( env_t::program_dir, argv[0] );
-- *(strrchr( env_t::program_dir, PATH_SEPARATOR[0] )+1) = 0;
-+ // strcpy( env_t::program_dir, argv[0] );
-+ // *(strrchr( env_t::program_dir, PATH_SEPARATOR[0] )+1) = 0;
-+ strcpy(env_t::program_dir, "/usr/share/games/simutrans/");
-
- #ifdef __APPLE__
- // change working directory from binary dir to bundle dir
Copied: simutrans/repos/community-x86_64/path-for-game-data.patch (from rev 418953, simutrans/trunk/path-for-game-data.patch)
===================================================================
--- path-for-game-data.patch (rev 0)
+++ path-for-game-data.patch 2018-12-30 01:19:16 UTC (rev 418954)
@@ -0,0 +1,18 @@
+look in /usr/share/games/simutrans for game data
+
+ at DPATCH@
+
+--- simutrans.orig/simmain.cc
++++ simutrans/simmain.cc
+@@ -437,8 +437,9 @@
+ strcat( env_t::program_dir, PATH_SEPARATOR );
+ }
+ else {
+- strcpy( env_t::program_dir, argv[0] );
+- *(strrchr( env_t::program_dir, PATH_SEPARATOR[0] )+1) = 0;
++ // strcpy( env_t::program_dir, argv[0] );
++ // *(strrchr( env_t::program_dir, PATH_SEPARATOR[0] )+1) = 0;
++ strcpy(env_t::program_dir, "/usr/share/games/simutrans/");
+
+ #ifdef __APPLE__
+ // change working directory from binary dir to bundle dir
Deleted: settings-folder.patch
===================================================================
--- settings-folder.patch 2018-12-30 01:18:55 UTC (rev 418953)
+++ settings-folder.patch 2018-12-30 01:19:16 UTC (rev 418954)
@@ -1,12 +0,0 @@
---- simsys.cc.orig 2011-10-28 20:32:25.000000000 +0200
-+++ simsys.cc 2011-11-10 23:09:10.380031846 +0100
-@@ -47,7 +47,7 @@
- #elif defined __APPLE__
- sprintf(buffer, "%s/Library/Simutrans", getenv("HOME"));
- #else
-- sprintf(buffer, "%s/simutrans", getenv("HOME"));
-+ sprintf(buffer, "%s/.simutrans", getenv("HOME"));
- #endif
-
- dr_mkdir(buffer);
-
Copied: simutrans/repos/community-x86_64/settings-folder.patch (from rev 418953, simutrans/trunk/settings-folder.patch)
===================================================================
--- settings-folder.patch (rev 0)
+++ settings-folder.patch 2018-12-30 01:19:16 UTC (rev 418954)
@@ -0,0 +1,12 @@
+--- simsys.cc.orig 2011-10-28 20:32:25.000000000 +0200
++++ simsys.cc 2011-11-10 23:09:10.380031846 +0100
+@@ -47,7 +47,7 @@
+ #elif defined __APPLE__
+ sprintf(buffer, "%s/Library/Simutrans", getenv("HOME"));
+ #else
+- sprintf(buffer, "%s/simutrans", getenv("HOME"));
++ sprintf(buffer, "%s/.simutrans", getenv("HOME"));
+ #endif
+
+ dr_mkdir(buffer);
+
Copied: simutrans/repos/community-x86_64/simutrans.appdata.xml (from rev 418953, simutrans/trunk/simutrans.appdata.xml)
===================================================================
--- simutrans.appdata.xml (rev 0)
+++ simutrans.appdata.xml 2018-12-30 01:19:16 UTC (rev 418954)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+ <id>com.simutrans.simutrans</id>
+ <launchable type="desktop-id">simutrans.desktop</launchable>
+ <name>Simutrans</name>
+ <summary>Transportation simulator</summary>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>Artistic-1.0</project_license>
+ <description>
+ <p>Simutrans is a free transportation simulator: the player operates a transportation company and has to transport goods and passengers between factories and different cities.</p>
+ </description>
+ <screenshots>
+ <screenshot type="default">
+ <image>https://screenshots.debian.net/screenshots/000/001/205/large.png</image>
+ </screenshot>
+ </screenshots>
+ <url type="bugtracker">https://forum.simutrans.com/index.php?board=8.0</url>
+ <url type="homepage">https://www.simutrans.com/</url>
+</component>
Deleted: simutrans.desktop
===================================================================
--- simutrans.desktop 2018-12-30 01:18:55 UTC (rev 418953)
+++ simutrans.desktop 2018-12-30 01:19:16 UTC (rev 418954)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Simutrans
-Comment=Transportation simulator
-Exec=simutrans
-Icon=simutrans
-Terminal=false
-Type=Application
-Categories=Game;Simulation;
-
Copied: simutrans/repos/community-x86_64/simutrans.desktop (from rev 418953, simutrans/trunk/simutrans.desktop)
===================================================================
--- simutrans.desktop (rev 0)
+++ simutrans.desktop 2018-12-30 01:19:16 UTC (rev 418954)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Simutrans
+Comment=Transportation simulator
+Exec=simutrans
+Icon=simutrans
+Terminal=false
+Type=Application
+Categories=Game;Simulation;
+
More information about the arch-commits
mailing list