Skip to content

Commit

Permalink
BUILD: Add port specific makefile for AmigaOS4.
Browse files Browse the repository at this point in the history
This moves the AmigaOS4 specific packaging rules from the global
ports.mk to a port specific makefile in the AmigaOS subdirectory of
the SDL backend (used for AmigaOS).

Previously, port specific makefiles were only used for cross compiling
builds and thus had a single entry in the cross compiling section of
the configure. Since AmigaOS4 is a desktop system supporting native
build, this required a second entry for when the host system is detected
as ppc-amigaos to support native builds.

However, currently this does break packaging of cross compiled builds
for Win32, OSX and Unix when done on AmigaOS4... but this is not likely
and has limited impact. To fix this, default _port_mk lines would need
to be added to the sections of the cross compiling switch for mingw32
etc. to override the AmigaOS4 OS setting of _port_mk.
  • Loading branch information
digitall committed Jul 20, 2014
1 parent fd89ecd commit 469eecb
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 17 deletions.
12 changes: 12 additions & 0 deletions backends/platform/sdl/amigaos/amigaos.mk
@@ -0,0 +1,12 @@
# Special target to create an AmigaOS snapshot installation
amigaos4dist: $(EXECUTABLE)
mkdir -p $(AMIGAOS4PATH)
mkdir -p $(AMIGAOS4PATH)/themes
mkdir -p $(AMIGAOS4PATH)/extras
$(STRIP) $(EXECUTABLE) -o $(AMIGAOS4PATH)/$(EXECUTABLE)
cp ${srcdir}/icons/scummvm.info $(AMIGAOS4PATH)/$(EXECUTABLE).info
cp $(DIST_FILES_THEMES) $(AMIGAOS4PATH)/themes/
ifdef DIST_FILES_ENGINEDATA
cp $(DIST_FILES_ENGINEDATA) $(AMIGAOS4PATH)/extras/
endif
cp $(DIST_FILES_DOCS) $(AMIGAOS4PATH)
3 changes: 3 additions & 0 deletions configure
Expand Up @@ -2074,6 +2074,7 @@ case $_host_os in
# Supress format warnings as the long 4 byte causes noisy warnings.
CXXFLAGS="$CXXFLAGS -Wno-format"
add_line_to_config_mk 'AMIGAOS = 1'
_port_mk="backends/platform/sdl/amigaos/amigaos.mk"
;;
android)
case $_host in
Expand Down Expand Up @@ -2752,6 +2753,8 @@ if test -n "$_host"; then
_ar="$_host-ar cru"
_as="$_host-as"
_windres=$_host-windres

_port_mk="backends/platform/sdl/amigaos/amigaos.mk"
;;
ps2)
DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE"
Expand Down
17 changes: 0 additions & 17 deletions ports.mk
Expand Up @@ -324,22 +324,5 @@ endif
@echo Now run
@echo "\tgit commit 'DISTS: Generated Code::Blocks and MSVC project files'"

#
# AmigaOS specific
#

# Special target to create an AmigaOS snapshot installation
amigaos4dist: $(EXECUTABLE)
mkdir -p $(AMIGAOS4PATH)
mkdir -p $(AMIGAOS4PATH)/themes
mkdir -p $(AMIGAOS4PATH)/extras
$(STRIP) $(EXECUTABLE) -o $(AMIGAOS4PATH)/$(EXECUTABLE)
cp ${srcdir}/icons/scummvm.info $(AMIGAOS4PATH)/$(EXECUTABLE).info
cp $(DIST_FILES_THEMES) $(AMIGAOS4PATH)/themes/
ifdef DIST_FILES_ENGINEDATA
cp $(DIST_FILES_ENGINEDATA) $(AMIGAOS4PATH)/extras/
endif
cp $(DIST_FILES_DOCS) $(AMIGAOS4PATH)

# Mark special targets as phony
.PHONY: deb bundle osxsnap win32dist install uninstall

0 comments on commit 469eecb

Please sign in to comment.