diff --git a/games-strategy/0ad/0ad-0.0.23b~alpha.recipe b/games-strategy/0ad/0ad-0.0.23b~alpha.recipe index 890ae2fb9..ebe9a0954 100644 --- a/games-strategy/0ad/0ad-0.0.23b~alpha.recipe +++ b/games-strategy/0ad/0ad-0.0.23b~alpha.recipe @@ -4,10 +4,10 @@ HOMEPAGE="https://play0ad.com/" COPYRIGHT="Wildfire Games" LICENSE="0ADLicense" REVISION="1" -SOURCE_URI="https://releases.wildfiregames.com/0ad-${portVersion/\~/-}-unix-build.tar.gz" -CHECKSUM_SHA256="bc2db65e09076f8e723c574339e7736b5571d525de3985cbb95ca11f318cc7a8" +SOURCE_URI="https://releases.wildfiregames.com/0ad-${portVersion/\~/-}-unix-build.tar.xz" +CHECKSUM_SHA256="01bff7641ee08cac896c54d518d7e4b01752513105558f212e3199d747512a37" SOURCE_DIR="0ad-${portVersion/\~/-}" -PATCHES="0ad-0.0.23-alpha.patch" +PATCHES="0ad-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="?x86" @@ -18,31 +18,32 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + lib:libboost_filesystem$secondaryArchSuffix + lib:libboost_system$secondaryArchSuffix + lib:libGL$secondaryArchSuffix lib:libcurl$secondaryArchSuffix - lib:libnspr4$secondaryArchSuffix - lib:libogg$secondaryArchSuffix - lib:libopenal$secondaryArchSuffix - lib:libpng$secondaryArchSuffix - libsdl2$secondaryArchSuffix - lib:libvorbis$secondaryArchSuffix - lib:libxml2$secondaryArchSuffix - lib:libzlib$secondaryArchSuffix - lib:libminiupnpc$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - lib:libz$secondaryArchSuffix - lib:libsodium$secondaryArchSuffix - lib:libgloox$secondaryArchSuffix - lib:libicui18n$secondaryArchSuffix >= 57 - lib:libicuuc$secondaryArchSuffix >= 57 - boost169$secondaryArchSuffix lib:libenet$secondaryArchSuffix + lib:libgloox$secondaryArchSuffix lib:libiconv$secondaryArchSuffix - mesa$secondaryArchSuffix + lib:libicui18n$secondaryArchSuffix + lib:libicuuc$secondaryArchSuffix + lib:libminiupnpc$secondaryArchSuffix + lib:libnspr4$secondaryArchSuffix + lib:libopenal$secondaryArchSuffix + lib:libplc4$secondaryArchSuffix + lib:libplds4$secondaryArchSuffix + lib:libpng16$secondaryArchSuffix + lib:libSDL2_2.0$secondaryArchSuffix + lib:libsodium$secondaryArchSuffix + lib:libvorbisfile$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libz$secondaryArchSuffix 0ad_data == $portVersion " BUILD_REQUIRES=" - boost169${secondaryArchSuffix}_devel + haiku${secondaryArchSuffix}_devel + devel:libboost_system$secondaryArchSuffix >= 1.69 devel:libsdl2$secondaryArchSuffix devel:libxml2$secondaryArchSuffix devel:libnspr4$secondaryArchSuffix @@ -67,35 +68,26 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel + cmd:awk + cmd:cmake cmd:gcc$secondaryArchSuffix cmd:g++$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:perl cmd:patch - cmd:python - cmd:cmake - cmd:xargs - cmd:awk - cmd:which - cmd:cat + cmd:perl + cmd:pkg_config$secondaryArchSuffix + cmd:python2 cmd:sed + cmd:which + cmd:xargs " -PATCH() -{ - # HACK: The patch provided for premake4 in the patch file does not apply correctly. - sed -i 's|linkoptions { "-rdynamic" }|linkoptions { "-Wl,--export-dynamic" }|g' build/premake/premake4/premake4.lua - sed -i 's|-rdynamic|-Wl,--export-dynamic|g' build/premake/premake4/build/gmake.unix/Premake4.make - sed -i 's|-ldl| |g' build/premake/premake4/build/gmake.unix/Premake4.make -} - BUILD() { - cd "build/workspaces/" - ./update-workspaces.sh --disable-atlas --minimal-flags --without-pch --datadir=$dataDir/0ad $jobArgs + cd build/workspaces + ./update-workspaces.sh --disable-atlas --minimal-flags --without-pch \ + --datadir=$dataDir/0ad $jobArgs cd gcc make $jobArgs @@ -103,20 +95,10 @@ BUILD() INSTALL() { - mkdir -p $appsDir - mkdir -p $appsDir/0ad - - mkdir -p $dataDir - mkdir -p $dataDir/0ad + mkdir -p $appsDir/0ad $dataDir/0ad cp -R binaries/data/* $dataDir/0ad - cp -R binaries/system/* $appsDir/0ad - - # HACK: I don't know of a better way to do this but 0 A.D. expects the exact library name "libminiupnpc.so.16". - # The Miniupnpc API 17 only has a single breaking change over API 16 and that only appears to apply on Windows. - # See http://miniupnp.free.fr/files/changelog.php?file=miniupnpc-2.1.tar.gz for more information. - # HaikuPorts does not have a recipe for miniupnpc API 16. - ln -s /system/lib/x86/libminiupnpc.so.17 $appsDir/0ad/libminiupnpc.so.16 + cp -R binaries/system/*.so binaries/system/pyrogenesis $appsDir/0ad addAppDeskbarSymlink $appsDir/0ad/pyrogenesis "0 A.D." } diff --git a/games-strategy/0ad/0ad-0.0.23~alpha.recipe b/games-strategy/0ad/0ad-0.0.23~alpha.recipe deleted file mode 100644 index cf4bee45e..000000000 --- a/games-strategy/0ad/0ad-0.0.23~alpha.recipe +++ /dev/null @@ -1,127 +0,0 @@ -SUMMARY="O A.D. - Game" -DESCRIPTION="A free, open-source, Real-Time Strategy (RTS) game." -HOMEPAGE="https://play0ad.com/" -COPYRIGHT="Wildfire Games" -LICENSE="0ADLicense" -REVISION="1" -SOURCE_URI="https://releases.wildfiregames.com/0ad-${portVersion/\~/-}-unix-build.tar.gz" -CHECKSUM_SHA256="7659155d3c85c053d6a2f50a07ea7ba69d2ee3337c9b56b78b226f60a3276014" -SOURCE_DIR="0ad-${portVersion/\~/-}" -PATCHES="0ad-${portVersion/\~/-}.patch" - -ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="?x86" - -PROVIDES=" - 0ad$secondaryArchSuffix = $portVersion - app:0ad$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libcurl$secondaryArchSuffix - lib:libnspr4$secondaryArchSuffix - lib:libogg$secondaryArchSuffix - lib:libopenal$secondaryArchSuffix - lib:libpng$secondaryArchSuffix - libsdl2$secondaryArchSuffix - lib:libvorbis$secondaryArchSuffix - lib:libxml2$secondaryArchSuffix - lib:libzlib$secondaryArchSuffix - lib:libminiupnpc$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - lib:libz$secondaryArchSuffix - lib:libsodium$secondaryArchSuffix - lib:libgloox$secondaryArchSuffix - lib:libicui18n$secondaryArchSuffix >= 57 - lib:libicuuc$secondaryArchSuffix >= 57 - boost169$secondaryArchSuffix - lib:libenet$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - mesa$secondaryArchSuffix - 0ad_data == $portVersion - " - -BUILD_REQUIRES=" - boost169${secondaryArchSuffix}_devel - devel:libsdl2$secondaryArchSuffix - devel:libxml2$secondaryArchSuffix - devel:libnspr4$secondaryArchSuffix - devel:libicudata$secondaryArchSuffix - devel:libicui18n$secondaryArchSuffix - devel:libicuio$secondaryArchSuffix - devel:libicutest$secondaryArchSuffix - devel:libicutu$secondaryArchSuffix - devel:libicuuc$secondaryArchSuffix - devel:libiconv$secondaryArchSuffix - devel:libplc4$secondaryArchSuffix - devel:libplds4$secondaryArchSuffix - devel:libenet$secondaryArchSuffix - devel:libgloox$secondaryArchSuffix - devel:libminiupnpc$secondaryArchSuffix - devel:libsodium$secondaryArchSuffix - devel:libGL$secondaryArchSuffix - devel:libcurl$secondaryArchSuffix - devel:libopenal$secondaryArchSuffix - devel:libvorbis$secondaryArchSuffix - devel:libpng$secondaryArchSuffix - " - -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:gcc$secondaryArchSuffix - cmd:g++$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:perl - cmd:patch - cmd:python - cmd:cmake - cmd:xargs - cmd:awk - cmd:which - cmd:cat - cmd:sed - " - -PATCH() -{ - # HACK: The patch provided for premake4 in the patch file does not apply correctly. - sed -i 's|linkoptions { "-rdynamic" }|linkoptions { "-Wl,--export-dynamic" }|g' build/premake/premake4/premake4.lua - sed -i 's|-rdynamic|-Wl,--export-dynamic|g' build/premake/premake4/build/gmake.unix/Premake4.make - sed -i 's|-ldl| |g' build/premake/premake4/build/gmake.unix/Premake4.make -} - -BUILD() -{ - cd "build/workspaces/" - ./update-workspaces.sh --disable-atlas --minimal-flags --without-pch --datadir=$dataDir/0ad $jobArgs - - cd gcc - make $jobArgs -} - -INSTALL() -{ - mkdir -p $appsDir - mkdir -p $appsDir/0ad - - mkdir -p $dataDir - mkdir -p $dataDir/0ad - - cp -R binaries/data/* $dataDir/0ad - cp -R binaries/system/* $appsDir/0ad - - # HACK: I don't know of a better way to do this but 0 A.D. expects the exact library name "libminiupnpc.so.16". - # The Miniupnpc API 17 only has a single breaking change over API 16 and that only appears to apply on Windows. - # See http://miniupnp.free.fr/files/changelog.php?file=miniupnpc-2.1.tar.gz for more information. - # HaikuPorts does not have a recipe for miniupnpc API 16. - ln -s /system/lib/x86/libminiupnpc.so.17 $appsDir/0ad/libminiupnpc.so.16 - - addAppDeskbarSymlink $appsDir/0ad/pyrogenesis "0 A.D." -} - -TEST() -{ - binaries/system/test -libdir "./binaries/system" -} diff --git a/games-strategy/0ad/patches/0ad-0.0.23-alpha.patch b/games-strategy/0ad/patches/0ad-0.0.23b~alpha.patchset similarity index 50% rename from games-strategy/0ad/patches/0ad-0.0.23-alpha.patch rename to games-strategy/0ad/patches/0ad-0.0.23b~alpha.patchset index ac60281d1..c0b774a17 100644 --- a/games-strategy/0ad/patches/0ad-0.0.23-alpha.patch +++ b/games-strategy/0ad/patches/0ad-0.0.23b~alpha.patchset @@ -1,7 +1,63 @@ -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/premake/extern_libs4.lua 0ad-0.0.23-alpha/build/premake/extern_libs4.lua ---- original/0ad-0.0.23-alpha/build/premake/extern_libs4.lua 2018-04-08 21:41:31.011534336 +0000 -+++ 0ad-0.0.23-alpha/build/premake/extern_libs4.lua 2019-06-05 09:51:34.060030976 +0000 -@@ -347,7 +347,7 @@ +From e06440cb80c414cb8f9dcc3f8ae04f8a9bcb8779 Mon Sep 17 00:00:00 2001 +From: BenjaminAmos <24301287+BenjaminAmos@users.noreply.github.com> +Date: Fri, 15 Nov 2019 22:07:00 +0100 +Subject: Haiku patch + +--- + build/premake/extern_libs4.lua | 7 +- + build/premake/extern_libs5.lua | 5 + + build/premake/premake4.lua | 17 +- + .../premake4/build/gmake.unix/Premake4.make | 384 +++++++++--------- + build/premake/premake4/premake4.lua | 2 +- + build/premake/premake5.lua | 19 +- + .../premake5/build/gmake.unix/Premake5.make | 8 +- + .../premake5/contrib/curl/lib/curl_setup.h | 4 + + .../premake/premake5/contrib/curl/lib/if2ip.c | 3 + + .../premake5/contrib/curl/premake5.lua | 2 +- + build/premake/premake5/premake5.lua | 8 +- + .../premake/premake5/src/host/os_getversion.c | 2 +- + build/premake/premake5/src/host/premake.c | 6 + + build/premake/premake5/src/host/premake.h | 2 +- + build/workspaces/update-workspaces.sh | 5 +- + .../fcollada/include/FCDocument/FCDocument.h | 2 +- + .../fcollada/include/FUtils/Platforms.h | 4 +- + .../fcollada/src/FCollada/FUtils/FUAssert.cpp | 4 + + .../src/FCollada/FUtils/FUPluginManager.cpp | 11 + + .../src/FCollada/FUtils/FUStringBuilder.h | 2 +- + .../source/nvtt/src/src/nvcore/Debug.cpp | 8 + + libraries/source/nvtt/src/src/nvcore/nvcore.h | 3 + + .../source/nvtt/src/src/nvcore/poshlib/posh.h | 5 + + .../source/nvtt/src/src/nvimage/ImageIO.cpp | 10 + + .../source/spidermonkey/FixHaikuBuild.diff | 197 +++++++++ + libraries/source/spidermonkey/build.sh | 51 +++ + libraries/source/spidermonkey/patch.sh | 3 + + source/lib/allocators/page_aligned.cpp | 8 + + source/lib/config2.h | 2 +- + source/lib/posix/posix_aio.h | 2 +- + source/lib/secure_crt.h | 4 +- + source/lib/sysdep/os.h | 10 +- + source/lib/sysdep/os/haiku/dir_watch.cpp | 36 ++ + source/lib/sysdep/os/haiku/haiku.cpp | 147 +++++++ + source/lib/sysdep/os/haiku/hcpu.cpp | 120 ++++++ + source/lib/sysdep/os/haiku/hdbg.cpp | 46 +++ + .../os/unix/unix_executable_pathname.cpp | 4 +- + source/lib/sysdep/os/unix/uvm.cpp | 3 + + source/main.cpp | 2 +- + source/ps/GameSetup/GameSetup.cpp | 5 +- + source/ps/GameSetup/Paths.cpp | 8 + + source/third_party/tinygettext/src/iconv.cpp | 2 +- + 42 files changed, 942 insertions(+), 231 deletions(-) + create mode 100644 libraries/source/spidermonkey/FixHaikuBuild.diff + create mode 100644 source/lib/sysdep/os/haiku/dir_watch.cpp + create mode 100644 source/lib/sysdep/os/haiku/haiku.cpp + create mode 100644 source/lib/sysdep/os/haiku/hcpu.cpp + create mode 100644 source/lib/sysdep/os/haiku/hdbg.cpp + +diff --git a/build/premake/extern_libs4.lua b/build/premake/extern_libs4.lua +index fed12da..3e97e22 100644 +--- a/build/premake/extern_libs4.lua ++++ b/build/premake/extern_libs4.lua +@@ -347,7 +347,7 @@ extern_lib_defs = { elseif os.is("macosx") then add_default_include_paths("iconv") defines { "LIBICONV_STATIC" } @@ -10,7 +66,7 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/prema defines { "HAVE_ICONV_CONST" } defines { "ICONV_CONST=const" } end -@@ -359,6 +359,7 @@ +@@ -359,6 +359,7 @@ extern_lib_defs = { add_default_links({ win_names = { "libiconv" }, osx_names = { "iconv" }, @@ -18,7 +74,7 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/prema dbg_suffix = "", no_delayload = 1, }) -@@ -722,14 +723,14 @@ +@@ -724,14 +725,14 @@ extern_lib_defs = { link_settings = function() add_default_links({ win_names = { }, @@ -35,10 +91,11 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/prema }) end, }, -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/premake/extern_libs5.lua 0ad-0.0.23-alpha/build/premake/extern_libs5.lua ---- original/0ad-0.0.23-alpha/build/premake/extern_libs5.lua 2018-04-29 15:44:48.011272192 +0000 -+++ 0ad-0.0.23-alpha/build/premake/extern_libs5.lua 2019-06-07 17:12:40.761528320 +0000 -@@ -313,6 +313,7 @@ +diff --git a/build/premake/extern_libs5.lua b/build/premake/extern_libs5.lua +index 710cc55..eb13e63 100644 +--- a/build/premake/extern_libs5.lua ++++ b/build/premake/extern_libs5.lua +@@ -320,6 +320,7 @@ extern_lib_defs = { add_default_links({ win_names = { "libiconv" }, osx_names = { "iconv" }, @@ -46,7 +103,7 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/prema dbg_suffix = "", no_delayload = 1, }) -@@ -685,17 +686,21 @@ +@@ -694,17 +695,21 @@ extern_lib_defs = { }, x11 = { link_settings = function() @@ -68,10 +125,11 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/prema end, }, zlib = { -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/premake/premake4.lua 0ad-0.0.23-alpha/build/premake/premake4.lua ---- original/0ad-0.0.23-alpha/build/premake/premake4.lua 2018-04-29 15:44:48.052428800 +0000 -+++ 0ad-0.0.23-alpha/build/premake/premake4.lua 2019-06-05 11:28:48.069730304 +0000 -@@ -382,7 +382,7 @@ +diff --git a/build/premake/premake4.lua b/build/premake/premake4.lua +index 8b997e2..dcb763d 100644 +--- a/build/premake/premake4.lua ++++ b/build/premake/premake4.lua +@@ -382,7 +382,7 @@ end -- add X11 includes paths after all the others so they don't conflict with -- bundled libs function project_add_x11_dirs() @@ -80,7 +138,7 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/prema -- X11 includes may be installed in one of a gadzillion of five places -- Famous last words: "You can't include too much! ;-)" includedirs { -@@ -835,6 +835,7 @@ +@@ -835,6 +835,7 @@ function setup_all_libs () windows = { "lib/sysdep/os/win", "lib/sysdep/os/win/wposix", "lib/sysdep/os/win/whrt" }, macosx = { "lib/sysdep/os/osx", "lib/sysdep/os/unix" }, bsd = { "lib/sysdep/os/bsd", "lib/sysdep/os/unix", "lib/sysdep/os/unix/x" }, @@ -88,9 +146,9 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/prema } for i,v in pairs(sysdep_dirs[os.get()]) do table.insert(source_dirs, v); -@@ -1022,6 +1023,13 @@ +@@ -1022,6 +1023,13 @@ function setup_main_exe () linkoptions { "-framework ApplicationServices", "-framework Cocoa", "-framework CoreFoundation" } - + end + + if os.is("haiku") then @@ -100,10 +158,10 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/prema + } + end end - - -@@ -1458,6 +1465,13 @@ - + + +@@ -1458,6 +1466,13 @@ function setup_tests() + includedirs { source_root .. "pch/test/" } end + @@ -114,12 +172,498 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/prema + } + end end - + -- must come first, so that VC sets it as the default project and therefore -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/premake/premake5/build/gmake.unix/Premake5.make 0ad-0.0.23-alpha/build/premake/premake5/build/gmake.unix/Premake5.make ---- original/0ad-0.0.23-alpha/build/premake/premake5/build/gmake.unix/Premake5.make 2017-10-28 16:10:49.040370176 +0000 -+++ 0ad-0.0.23-alpha/build/premake/premake5/build/gmake.unix/Premake5.make 2019-01-10 17:32:02.104857600 +0000 -@@ -22,9 +22,9 @@ +diff --git a/build/premake/premake4/build/gmake.unix/Premake4.make b/build/premake/premake4/build/gmake.unix/Premake4.make +index f5f979c..cab0abb 100644 +--- a/build/premake/premake4/build/gmake.unix/Premake4.make ++++ b/build/premake/premake4/build/gmake.unix/Premake4.make +@@ -28,8 +28,8 @@ ifeq ($(config),release) + CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) + CFLAGS += $(CPPFLAGS) -Wall -Os + CXXFLAGS += $(CPPFLAGS) -Wall -Os +- LDFLAGS += -s -rdynamic +- LIBS += -lm -ldl ++ LDFLAGS += -s -Wl,--export-dynamic ++ LIBS += -lm + RESFLAGS += $(DEFINES) $(INCLUDES) + LDDEPS += + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(LDDEPS) $(LIBS) +@@ -50,8 +50,8 @@ ifeq ($(config),debug) + CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) + CFLAGS += $(CPPFLAGS) -Wall -g + CXXFLAGS += $(CPPFLAGS) -Wall -g +- LDFLAGS += -rdynamic +- LIBS += -lm -ldl ++ LDFLAGS += -Wl,--export-dynamic ++ LIBS += -lm + RESFLAGS += $(DEFINES) $(INCLUDES) + LDDEPS += + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(LDDEPS) $(LIBS) +@@ -61,56 +61,56 @@ ifeq ($(config),debug) + endef + define POSTBUILDCMDS + endef +-endif +- +-OBJECTS := \ +- $(OBJDIR)/path_isabsolute.o \ +- $(OBJDIR)/os_getversion.o \ +- $(OBJDIR)/os_isfile.o \ +- $(OBJDIR)/os_uuid.o \ +- $(OBJDIR)/os_chdir.o \ +- $(OBJDIR)/os_pathsearch.o \ +- $(OBJDIR)/os_rmdir.o \ +- $(OBJDIR)/os_match.o \ +- $(OBJDIR)/scripts.o \ +- $(OBJDIR)/os_copyfile.o \ +- $(OBJDIR)/os_isdir.o \ +- $(OBJDIR)/os_mkdir.o \ +- $(OBJDIR)/os_getcwd.o \ +- $(OBJDIR)/premake.o \ +- $(OBJDIR)/string_endswith.o \ +- $(OBJDIR)/loadlib.o \ +- $(OBJDIR)/ldebug.o \ +- $(OBJDIR)/lstring.o \ +- $(OBJDIR)/lparser.o \ +- $(OBJDIR)/lfunc.o \ +- $(OBJDIR)/ldump.o \ +- $(OBJDIR)/liolib.o \ +- $(OBJDIR)/lgc.o \ +- $(OBJDIR)/lundump.o \ +- $(OBJDIR)/lopcodes.o \ +- $(OBJDIR)/lmem.o \ +- $(OBJDIR)/lstate.o \ +- $(OBJDIR)/ltm.o \ +- $(OBJDIR)/ldo.o \ +- $(OBJDIR)/lzio.o \ +- $(OBJDIR)/lstrlib.o \ +- $(OBJDIR)/lapi.o \ +- $(OBJDIR)/lbaselib.o \ +- $(OBJDIR)/ltablib.o \ +- $(OBJDIR)/llex.o \ +- $(OBJDIR)/loslib.o \ +- $(OBJDIR)/ltable.o \ +- $(OBJDIR)/linit.o \ +- $(OBJDIR)/ldblib.o \ +- $(OBJDIR)/lmathlib.o \ +- $(OBJDIR)/lobject.o \ +- $(OBJDIR)/lvm.o \ +- $(OBJDIR)/lcode.o \ +- $(OBJDIR)/lauxlib.o \ +- +-RESOURCES := \ +- ++endif ++ ++OBJECTS := \ ++ $(OBJDIR)/path_isabsolute.o \ ++ $(OBJDIR)/os_getversion.o \ ++ $(OBJDIR)/os_isfile.o \ ++ $(OBJDIR)/os_uuid.o \ ++ $(OBJDIR)/os_chdir.o \ ++ $(OBJDIR)/os_pathsearch.o \ ++ $(OBJDIR)/os_rmdir.o \ ++ $(OBJDIR)/os_match.o \ ++ $(OBJDIR)/scripts.o \ ++ $(OBJDIR)/os_copyfile.o \ ++ $(OBJDIR)/os_isdir.o \ ++ $(OBJDIR)/os_mkdir.o \ ++ $(OBJDIR)/os_getcwd.o \ ++ $(OBJDIR)/premake.o \ ++ $(OBJDIR)/string_endswith.o \ ++ $(OBJDIR)/loadlib.o \ ++ $(OBJDIR)/ldebug.o \ ++ $(OBJDIR)/lstring.o \ ++ $(OBJDIR)/lparser.o \ ++ $(OBJDIR)/lfunc.o \ ++ $(OBJDIR)/ldump.o \ ++ $(OBJDIR)/liolib.o \ ++ $(OBJDIR)/lgc.o \ ++ $(OBJDIR)/lundump.o \ ++ $(OBJDIR)/lopcodes.o \ ++ $(OBJDIR)/lmem.o \ ++ $(OBJDIR)/lstate.o \ ++ $(OBJDIR)/ltm.o \ ++ $(OBJDIR)/ldo.o \ ++ $(OBJDIR)/lzio.o \ ++ $(OBJDIR)/lstrlib.o \ ++ $(OBJDIR)/lapi.o \ ++ $(OBJDIR)/lbaselib.o \ ++ $(OBJDIR)/ltablib.o \ ++ $(OBJDIR)/llex.o \ ++ $(OBJDIR)/loslib.o \ ++ $(OBJDIR)/ltable.o \ ++ $(OBJDIR)/linit.o \ ++ $(OBJDIR)/ldblib.o \ ++ $(OBJDIR)/lmathlib.o \ ++ $(OBJDIR)/lobject.o \ ++ $(OBJDIR)/lvm.o \ ++ $(OBJDIR)/lcode.o \ ++ $(OBJDIR)/lauxlib.o \ ++ ++RESOURCES := \ ++ + SHELLTYPE := msdos + ifeq (,$(ComSpec)$(COMSPEC)) + SHELLTYPE := posix +@@ -165,141 +165,141 @@ ifneq (,$(PCH)) + $(GCH): $(PCH) | $(OBJDIR) + @echo $(notdir $<) + -$(SILENT) cp $< $(OBJDIR) +- $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" +-endif +- +-$(OBJDIR)/path_isabsolute.o: ../../src/host/path_isabsolute.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/path_isabsolute.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/os_getversion.o: ../../src/host/os_getversion.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_getversion.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/os_isfile.o: ../../src/host/os_isfile.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_isfile.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/os_uuid.o: ../../src/host/os_uuid.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_uuid.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/os_chdir.o: ../../src/host/os_chdir.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_chdir.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/os_pathsearch.o: ../../src/host/os_pathsearch.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_pathsearch.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/os_rmdir.o: ../../src/host/os_rmdir.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_rmdir.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/os_match.o: ../../src/host/os_match.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_match.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/scripts.o: ../../src/host/scripts.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/scripts.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/os_copyfile.o: ../../src/host/os_copyfile.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_copyfile.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/os_isdir.o: ../../src/host/os_isdir.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_isdir.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/os_mkdir.o: ../../src/host/os_mkdir.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_mkdir.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/os_getcwd.o: ../../src/host/os_getcwd.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_getcwd.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/premake.o: ../../src/host/premake.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/premake.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/string_endswith.o: ../../src/host/string_endswith.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/string_endswith.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/loadlib.o: ../../src/host/lua-5.1.4/src/loadlib.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/loadlib.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/ldebug.o: ../../src/host/lua-5.1.4/src/ldebug.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ldebug.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/lstring.o: ../../src/host/lua-5.1.4/src/lstring.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lstring.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/lparser.o: ../../src/host/lua-5.1.4/src/lparser.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lparser.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/lfunc.o: ../../src/host/lua-5.1.4/src/lfunc.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lfunc.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/ldump.o: ../../src/host/lua-5.1.4/src/ldump.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ldump.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/liolib.o: ../../src/host/lua-5.1.4/src/liolib.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/liolib.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/lgc.o: ../../src/host/lua-5.1.4/src/lgc.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lgc.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/lundump.o: ../../src/host/lua-5.1.4/src/lundump.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lundump.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/lopcodes.o: ../../src/host/lua-5.1.4/src/lopcodes.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lopcodes.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/lmem.o: ../../src/host/lua-5.1.4/src/lmem.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lmem.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/lstate.o: ../../src/host/lua-5.1.4/src/lstate.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lstate.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/ltm.o: ../../src/host/lua-5.1.4/src/ltm.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ltm.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/ldo.o: ../../src/host/lua-5.1.4/src/ldo.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ldo.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/lzio.o: ../../src/host/lua-5.1.4/src/lzio.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lzio.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/lstrlib.o: ../../src/host/lua-5.1.4/src/lstrlib.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lstrlib.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/lapi.o: ../../src/host/lua-5.1.4/src/lapi.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lapi.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/lbaselib.o: ../../src/host/lua-5.1.4/src/lbaselib.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lbaselib.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/ltablib.o: ../../src/host/lua-5.1.4/src/ltablib.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ltablib.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/llex.o: ../../src/host/lua-5.1.4/src/llex.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/llex.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/loslib.o: ../../src/host/lua-5.1.4/src/loslib.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/loslib.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/ltable.o: ../../src/host/lua-5.1.4/src/ltable.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ltable.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/linit.o: ../../src/host/lua-5.1.4/src/linit.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/linit.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/ldblib.o: ../../src/host/lua-5.1.4/src/ldblib.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ldblib.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/lmathlib.o: ../../src/host/lua-5.1.4/src/lmathlib.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lmathlib.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/lobject.o: ../../src/host/lua-5.1.4/src/lobject.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lobject.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/lvm.o: ../../src/host/lua-5.1.4/src/lvm.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lvm.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/lcode.o: ../../src/host/lua-5.1.4/src/lcode.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lcode.d -MT "$@" -o "$@" -c "$<" +-$(OBJDIR)/lauxlib.o: ../../src/host/lua-5.1.4/src/lauxlib.c $(GCH) | prebuild +- @echo $(notdir $<) +- $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lauxlib.d -MT "$@" -o "$@" -c "$<" +- +--include $(OBJECTS:%.o=%.d) +--include $(GCH:%.h.gch=%.h.d) +\ No newline at end of file ++ $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" ++endif ++ ++$(OBJDIR)/path_isabsolute.o: ../../src/host/path_isabsolute.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/path_isabsolute.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/os_getversion.o: ../../src/host/os_getversion.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_getversion.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/os_isfile.o: ../../src/host/os_isfile.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_isfile.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/os_uuid.o: ../../src/host/os_uuid.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_uuid.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/os_chdir.o: ../../src/host/os_chdir.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_chdir.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/os_pathsearch.o: ../../src/host/os_pathsearch.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_pathsearch.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/os_rmdir.o: ../../src/host/os_rmdir.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_rmdir.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/os_match.o: ../../src/host/os_match.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_match.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/scripts.o: ../../src/host/scripts.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/scripts.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/os_copyfile.o: ../../src/host/os_copyfile.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_copyfile.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/os_isdir.o: ../../src/host/os_isdir.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_isdir.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/os_mkdir.o: ../../src/host/os_mkdir.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_mkdir.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/os_getcwd.o: ../../src/host/os_getcwd.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_getcwd.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/premake.o: ../../src/host/premake.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/premake.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/string_endswith.o: ../../src/host/string_endswith.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/string_endswith.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/loadlib.o: ../../src/host/lua-5.1.4/src/loadlib.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/loadlib.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/ldebug.o: ../../src/host/lua-5.1.4/src/ldebug.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ldebug.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/lstring.o: ../../src/host/lua-5.1.4/src/lstring.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lstring.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/lparser.o: ../../src/host/lua-5.1.4/src/lparser.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lparser.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/lfunc.o: ../../src/host/lua-5.1.4/src/lfunc.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lfunc.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/ldump.o: ../../src/host/lua-5.1.4/src/ldump.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ldump.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/liolib.o: ../../src/host/lua-5.1.4/src/liolib.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/liolib.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/lgc.o: ../../src/host/lua-5.1.4/src/lgc.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lgc.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/lundump.o: ../../src/host/lua-5.1.4/src/lundump.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lundump.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/lopcodes.o: ../../src/host/lua-5.1.4/src/lopcodes.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lopcodes.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/lmem.o: ../../src/host/lua-5.1.4/src/lmem.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lmem.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/lstate.o: ../../src/host/lua-5.1.4/src/lstate.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lstate.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/ltm.o: ../../src/host/lua-5.1.4/src/ltm.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ltm.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/ldo.o: ../../src/host/lua-5.1.4/src/ldo.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ldo.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/lzio.o: ../../src/host/lua-5.1.4/src/lzio.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lzio.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/lstrlib.o: ../../src/host/lua-5.1.4/src/lstrlib.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lstrlib.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/lapi.o: ../../src/host/lua-5.1.4/src/lapi.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lapi.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/lbaselib.o: ../../src/host/lua-5.1.4/src/lbaselib.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lbaselib.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/ltablib.o: ../../src/host/lua-5.1.4/src/ltablib.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ltablib.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/llex.o: ../../src/host/lua-5.1.4/src/llex.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/llex.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/loslib.o: ../../src/host/lua-5.1.4/src/loslib.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/loslib.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/ltable.o: ../../src/host/lua-5.1.4/src/ltable.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ltable.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/linit.o: ../../src/host/lua-5.1.4/src/linit.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/linit.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/ldblib.o: ../../src/host/lua-5.1.4/src/ldblib.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ldblib.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/lmathlib.o: ../../src/host/lua-5.1.4/src/lmathlib.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lmathlib.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/lobject.o: ../../src/host/lua-5.1.4/src/lobject.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lobject.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/lvm.o: ../../src/host/lua-5.1.4/src/lvm.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lvm.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/lcode.o: ../../src/host/lua-5.1.4/src/lcode.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lcode.d -MT "$@" -o "$@" -c "$<" ++$(OBJDIR)/lauxlib.o: ../../src/host/lua-5.1.4/src/lauxlib.c $(GCH) | prebuild ++ @echo $(notdir $<) ++ $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lauxlib.d -MT "$@" -o "$@" -c "$<" ++ ++-include $(OBJECTS:%.o=%.d) ++-include $(GCH:%.h.gch=%.h.d) +diff --git a/build/premake/premake4/premake4.lua b/build/premake/premake4/premake4.lua +index 78f461e..c75e7ec 100644 +--- a/build/premake/premake4/premake4.lua ++++ b/build/premake/premake4/premake4.lua +@@ -66,7 +66,7 @@ + linkoptions { "-mmacosx-version-min=10.4" } + + configuration { "not windows", "not solaris", "not macosx" } +- linkoptions { "-rdynamic" } ++ linkoptions { "-Wl,--export-dynamic" } + + configuration { "solaris" } + linkoptions { "-Wl,--export-dynamic" } +diff --git a/build/premake/premake5.lua b/build/premake/premake5.lua +index 36928fb..1d3985b 100644 +--- a/build/premake/premake5.lua ++++ b/build/premake/premake5.lua +@@ -344,7 +344,7 @@ function project_set_build_flags() + defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] } + end + +- if os.istarget("linux") or os.istarget("bsd") then ++ if os.istarget("linux") or os.istarget("bsd") or os.istarget("haiku") then + -- To use our local shared libraries, they need to be found in the + -- runtime dynamic linker path. Add their path to -rpath. + if _OPTIONS["libdir"] then +@@ -370,7 +370,7 @@ end + -- add X11 includes paths after all the others so they don't conflict with + -- bundled libs + function project_add_x11_dirs() +- if not os.istarget("windows") and not os.istarget("macosx") then ++ if not os.istarget("windows") and not os.istarget("macosx") and not os.istarget("haiku") then + -- X11 includes may be installed in one of a gadzillion of five places + -- Famous last words: "You can't include too much! ;-)" + sysincludedirs { +@@ -835,6 +835,7 @@ function setup_all_libs () + windows = { "lib/sysdep/os/win", "lib/sysdep/os/win/wposix", "lib/sysdep/os/win/whrt" }, + macosx = { "lib/sysdep/os/osx", "lib/sysdep/os/unix" }, + bsd = { "lib/sysdep/os/bsd", "lib/sysdep/os/unix", "lib/sysdep/os/unix/x" }, ++ haiku = { "lib/sysdep/os/haiku", "lib/sysdep/os/unix" } + } + for i,v in pairs(sysdep_dirs[os.target()]) do + table.insert(source_dirs, v); +@@ -1036,6 +1037,13 @@ function setup_main_exe () + links { "ApplicationServices.framework", "Cocoa.framework", "CoreFoundation.framework" } + + end ++ ++ if os.istarget("haiku") then ++ links { "be" } ++ linkoptions { ++ "/boot/system/lib/libnetwork.so" ++ } ++ end + end + + +@@ -1420,6 +1428,13 @@ function setup_tests() + + includedirs { source_root .. "pch/test/" } + end ++ ++ if os.istarget("haiku") then ++ links { "be" } ++ linkoptions { ++ "/boot/system/lib/libnetwork.so" ++ } ++ end + end + + -- must come first, so that VC sets it as the default project and therefore +diff --git a/build/premake/premake5/build/gmake.unix/Premake5.make b/build/premake/premake5/build/gmake.unix/Premake5.make +index 70812a9..384b1e2 100644 +--- a/build/premake/premake5/build/gmake.unix/Premake5.make ++++ b/build/premake/premake5/build/gmake.unix/Premake5.make +@@ -22,9 +22,9 @@ ifeq ($(config),release) ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -fno-stack-protector ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) @@ -131,7 +675,7 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/prema LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) define PREBUILDCMDS endef -@@ -49,9 +49,9 @@ +@@ -49,9 +49,9 @@ ifeq ($(config),debug) ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) @@ -143,13 +687,14 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/prema LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) define PREBUILDCMDS endef -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/premake/premake5/contrib/curl/lib/curl_setup.h 0ad-0.0.23-alpha/build/premake/premake5/contrib/curl/lib/curl_setup.h ---- original/0ad-0.0.23-alpha/build/premake/premake5/contrib/curl/lib/curl_setup.h 2017-10-28 16:10:49.057147392 +0000 -+++ 0ad-0.0.23-alpha/build/premake/premake5/contrib/curl/lib/curl_setup.h 2019-01-10 17:03:25.658243584 +0000 +diff --git a/build/premake/premake5/contrib/curl/lib/curl_setup.h b/build/premake/premake5/contrib/curl/lib/curl_setup.h +index f75d7ed..fd67635 100644 +--- a/build/premake/premake5/contrib/curl/lib/curl_setup.h ++++ b/build/premake/premake5/contrib/curl/lib/curl_setup.h @@ -86,6 +86,10 @@ # include "config-linux.h" #endif - + +#ifdef __HAIKU__ +# include "config-linux.h" +#endif @@ -157,9 +702,10 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/prema #ifdef __APPLE__ && __MACH__ # include "config-osx.h" #endif -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/premake/premake5/contrib/curl/lib/if2ip.c 0ad-0.0.23-alpha/build/premake/premake5/contrib/curl/lib/if2ip.c ---- original/0ad-0.0.23-alpha/build/premake/premake5/contrib/curl/lib/if2ip.c 2017-10-28 16:10:49.063963136 +0000 -+++ 0ad-0.0.23-alpha/build/premake/premake5/contrib/curl/lib/if2ip.c 2019-01-10 17:07:04.829423616 +0000 +diff --git a/build/premake/premake5/contrib/curl/lib/if2ip.c b/build/premake/premake5/contrib/curl/lib/if2ip.c +index d876615..7ee26c5 100644 +--- a/build/premake/premake5/contrib/curl/lib/if2ip.c ++++ b/build/premake/premake5/contrib/curl/lib/if2ip.c @@ -40,6 +40,9 @@ #ifdef HAVE_SYS_SOCKIO_H # include @@ -170,25 +716,27 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/prema #ifdef HAVE_IFADDRS_H # include #endif -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/premake/premake5/contrib/curl/premake5.lua 0ad-0.0.23-alpha/build/premake/premake5/contrib/curl/premake5.lua ---- original/0ad-0.0.23-alpha/build/premake/premake5/contrib/curl/premake5.lua 2017-10-28 16:10:49.031457280 +0000 -+++ 0ad-0.0.23-alpha/build/premake/premake5/contrib/curl/premake5.lua 2019-01-10 16:47:35.566493184 +0000 -@@ -27,7 +27,7 @@ +diff --git a/build/premake/premake5/contrib/curl/premake5.lua b/build/premake/premake5/contrib/curl/premake5.lua +index da5face..5c83c03 100644 +--- a/build/premake/premake5/contrib/curl/premake5.lua ++++ b/build/premake/premake5/contrib/curl/premake5.lua +@@ -27,7 +27,7 @@ project "curl-lib" defines { "USE_MBEDTLS" } - + filter { "system:linux or bsd" } - defines { "CURL_HIDDEN_SYMBOLS" } + defines { "CURL_HIDDEN_SYMBOLS", "_BSD_SOURCE" } - + -- find the location of the ca bundle local ca = nil -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/premake/premake5/premake5.lua 0ad-0.0.23-alpha/build/premake/premake5/premake5.lua ---- original/0ad-0.0.23-alpha/build/premake/premake5/premake5.lua 2017-10-28 16:10:49.048496640 +0000 -+++ 0ad-0.0.23-alpha/build/premake/premake5/premake5.lua 2019-06-07 15:26:48.134217728 +0000 -@@ -164,12 +164,12 @@ +diff --git a/build/premake/premake5/premake5.lua b/build/premake/premake5/premake5.lua +index 77cbb14..8d37526 100644 +--- a/build/premake/premake5/premake5.lua ++++ b/build/premake/premake5/premake5.lua +@@ -160,12 +160,12 @@ filter "system:windows" links { "ole32", "ws2_32", "advapi32" } - + - filter "system:linux or bsd or hurd" + filter "system:linux or bsd or hurd or haiku" defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" } @@ -196,37 +744,39 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/prema - linkoptions { "-rdynamic" } + links { "m", "dl", "network" } + linkoptions { "-Wl,--export-all-symbols" } - + - filter "system:linux or hurd" + filter { "system:linux or hurd", "system:not bsd" } links { "dl", "rt" } - + filter { "system:not windows", "system:not macosx" } -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/premake/premake5/src/host/os_getversion.c 0ad-0.0.23-alpha/build/premake/premake5/src/host/os_getversion.c ---- original/0ad-0.0.23-alpha/build/premake/premake5/src/host/os_getversion.c 2017-10-28 16:10:49.025427968 +0000 -+++ 0ad-0.0.23-alpha/build/premake/premake5/src/host/os_getversion.c 2019-06-07 15:18:41.352321536 +0000 -@@ -193,7 +193,7 @@ - +diff --git a/build/premake/premake5/src/host/os_getversion.c b/build/premake/premake5/src/host/os_getversion.c +index 40b0c83..35ae071 100644 +--- a/build/premake/premake5/src/host/os_getversion.c ++++ b/build/premake/premake5/src/host/os_getversion.c +@@ -193,7 +193,7 @@ int getversion(struct OsVersionInfo* info) + /*************************************************************/ - + -#elif defined(PLATFORM_BSD) || defined(PLATFORM_LINUX) || defined(PLATFORM_SOLARIS) || defined(PLATFORM_HURD) +#elif defined(PLATFORM_BSD) || defined(PLATFORM_LINUX) || defined(PLATFORM_SOLARIS) || defined(PLATFORM_HURD) || defined(__HAIKU__) - + #include #include -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/premake/premake5/src/host/premake.c 0ad-0.0.23-alpha/build/premake/premake5/src/host/premake.c ---- original/0ad-0.0.23-alpha/build/premake/premake5/src/host/premake.c 2017-10-28 16:10:49.023592960 +0000 -+++ 0ad-0.0.23-alpha/build/premake/premake5/src/host/premake.c 2019-06-07 16:03:00.429654016 +0000 -@@ -368,6 +370,7 @@ +diff --git a/build/premake/premake5/src/host/premake.c b/build/premake/premake5/src/host/premake.c +index bdfa56b..fbc63fa 100644 +--- a/build/premake/premake5/src/host/premake.c ++++ b/build/premake/premake5/src/host/premake.c +@@ -368,6 +368,7 @@ int premake_locate_executable(lua_State* L, const char* argv0) } #endif - + +#if !defined(__HAIKU__) /* As a fallback, search the PATH with argv[0] */ if (!path) { -@@ -400,6 +403,11 @@ - +@@ -400,6 +401,11 @@ int premake_locate_executable(lua_State* L, const char* argv0) + path = lua_tostring(L, -1); } +#else @@ -234,99 +784,41 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/prema + getcwd(buffer, PATH_MAX); + path = buffer; +#endif - + lua_pushstring(L, path); return 1; -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/premake/premake5/src/host/premake.h 0ad-0.0.23-alpha/build/premake/premake5/src/host/premake.h ---- original/0ad-0.0.23-alpha/build/premake/premake5/src/host/premake.h 2017-10-28 16:10:49.025952256 +0000 -+++ 0ad-0.0.23-alpha/build/premake/premake5/src/host/premake.h 2019-06-07 16:01:49.395051008 +0000 +diff --git a/build/premake/premake5/src/host/premake.h b/build/premake/premake5/src/host/premake.h +index 0a0c0d3..a3cae56 100644 +--- a/build/premake/premake5/src/host/premake.h ++++ b/build/premake/premake5/src/host/premake.h @@ -43,7 +43,7 @@ #define PLATFORM_STRING "windows" #endif - + -#define PLATFORM_POSIX (PLATFORM_LINUX || PLATFORM_BSD || PLATFORM_MACOSX || PLATFORM_SOLARIS) +#define PLATFORM_POSIX (PLATFORM_LINUX || PLATFORM_BSD || PLATFORM_MACOSX || PLATFORM_SOLARIS || PLATFORM_HAIKU) - - + + /* Pull in platform-specific headers required by built-in functions */ -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/premake/premake5.lua 0ad-0.0.23-alpha/build/premake/premake5.lua ---- original/0ad-0.0.23-alpha/build/premake/premake5.lua 2018-04-22 18:14:45.011534336 +0000 -+++ 0ad-0.0.23-alpha/build/premake/premake5.lua 2019-06-07 19:00:27.612368384 +0000 -@@ -344,7 +344,7 @@ - defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] } - end - -- if os.istarget("linux") or os.istarget("bsd") then -+ if os.istarget("linux") or os.istarget("bsd") or os.istarget("haiku") then - -- To use our local shared libraries, they need to be found in the - -- runtime dynamic linker path. Add their path to -rpath. - if _OPTIONS["libdir"] then -@@ -370,7 +370,7 @@ - -- add X11 includes paths after all the others so they don't conflict with - -- bundled libs - function project_add_x11_dirs() -- if not os.istarget("windows") and not os.istarget("macosx") then -+ if not os.istarget("windows") and not os.istarget("macosx") and not os.istarget("haiku") then - -- X11 includes may be installed in one of a gadzillion of five places - -- Famous last words: "You can't include too much! ;-)" - sysincludedirs { -@@ -835,6 +835,7 @@ - windows = { "lib/sysdep/os/win", "lib/sysdep/os/win/wposix", "lib/sysdep/os/win/whrt" }, - macosx = { "lib/sysdep/os/osx", "lib/sysdep/os/unix" }, - bsd = { "lib/sysdep/os/bsd", "lib/sysdep/os/unix", "lib/sysdep/os/unix/x" }, -+ haiku = { "lib/sysdep/os/haiku", "lib/sysdep/os/unix" } - } - for i,v in pairs(sysdep_dirs[os.target()]) do - table.insert(source_dirs, v); -@@ -1036,6 +1037,13 @@ - links { "ApplicationServices.framework", "Cocoa.framework", "CoreFoundation.framework" } - - end -+ -+ if os.istarget("haiku") then -+ links { "be" } -+ linkoptions { -+ "/boot/system/lib/libnetwork.so" -+ } -+ end - end - - -@@ -1420,6 +1428,13 @@ - - includedirs { source_root .. "pch/test/" } - end -+ -+ if os.istarget("haiku") then -+ links { "be" } -+ linkoptions { -+ "/boot/system/lib/libnetwork.so" -+ } -+ end - end - - -- must come first, so that VC sets it as the default project and therefore -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/build/workspaces/update-workspaces.sh 0ad-0.0.23-alpha/build/workspaces/update-workspaces.sh ---- original/0ad-0.0.23-alpha/build/workspaces/update-workspaces.sh 2017-10-30 13:52:05.021495808 +0000 -+++ 0ad-0.0.23-alpha/build/workspaces/update-workspaces.sh 2019-06-07 15:03:49.098566144 +0000 -@@ -1,9 +1,10 @@ +diff --git a/build/workspaces/update-workspaces.sh b/build/workspaces/update-workspaces.sh +index e7764b4..b91bf34 100755 +--- a/build/workspaces/update-workspaces.sh ++++ b/build/workspaces/update-workspaces.sh +@@ -1,7 +1,8 @@ #!/bin/sh - + -if [ "$(id -u)" = "0" ]; then - echo "Running as root will mess up file permissions. Aborting ..." 1>&2 -- exit 1 --fi -+#if [ "$(id -u)" = "0" ]; then -+# echo "Running as root will mess up file permissions. Aborting ..." -+#1>&2 -+# exit 1 -+#fi - - die() - { -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/source/fcollada/include/FCDocument/FCDocument.h 0ad-0.0.23-alpha/libraries/source/fcollada/include/FCDocument/FCDocument.h ---- original/0ad-0.0.23-alpha/libraries/source/fcollada/include/FCDocument/FCDocument.h 2018-03-03 16:33:02.051118080 +0000 -+++ 0ad-0.0.23-alpha/libraries/source/fcollada/include/FCDocument/FCDocument.h 2019-06-07 17:02:13.541589504 +0000 ++if [ "`uname -s`" != "Haiku" -a "$(id -u)" = "0" ]; then ++ echo "Running as root will mess up file permissions. Aborting ..." ++1>&2 + exit 1 + fi + +diff --git a/libraries/source/fcollada/include/FCDocument/FCDocument.h b/libraries/source/fcollada/include/FCDocument/FCDocument.h +index de23d94..c7127ef 100644 +--- a/libraries/source/fcollada/include/FCDocument/FCDocument.h ++++ b/libraries/source/fcollada/include/FCDocument/FCDocument.h @@ -30,7 +30,7 @@ #if defined(WIN32) template class FCOLLADA_EXPORT FCDLibrary; /**< Trick Doxygen. */ @@ -336,33 +828,35 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/s template class FCDLibrary; /**< Trick Doxygen. */ template class FUUniqueStringMapT; /**< Trick Doxygen. */ #endif // LINUX -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/source/fcollada/include/FUtils/Platforms.h 0ad-0.0.23-alpha/libraries/source/fcollada/include/FUtils/Platforms.h ---- original/0ad-0.0.23-alpha/libraries/source/fcollada/include/FUtils/Platforms.h 2018-03-03 16:33:02.041418752 +0000 -+++ 0ad-0.0.23-alpha/libraries/source/fcollada/include/FUtils/Platforms.h 2019-06-07 16:58:02.051904512 +0000 +diff --git a/libraries/source/fcollada/include/FUtils/Platforms.h b/libraries/source/fcollada/include/FUtils/Platforms.h +index 8498d99..e3bc3cc 100644 +--- a/libraries/source/fcollada/include/FUtils/Platforms.h ++++ b/libraries/source/fcollada/include/FUtils/Platforms.h @@ -74,7 +74,7 @@ #include #include - + -#elif defined(LINUX) || defined(__PPU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) +#elif defined(LINUX) || defined(__PPU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__HAIKU__) #include #include #include -@@ -125,7 +125,7 @@ +@@ -125,7 +125,7 @@ typedef uint8_t byte; #endif // PLATFORMS - + // Important functions that some OSes have missing! -#if defined(__APPLE__) || defined(LINUX) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) +#if defined(__APPLE__) || defined(LINUX) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__HAIKU__) inline char* strlower(char* str) { char* it = str; while (*it != 0) { *it = tolower(*it); ++it; } return str; } inline wchar_t* wcslwr(wchar_t* str) { wchar_t* it = str; while (*it != 0) { *it = towlower(*it); ++it; } return str; } inline int wcsicmp(const wchar_t* s1, const wchar_t* s2) { wchar_t c1 = *s1, c2 = *s2; while (c1 != 0 && c2 != 0) { if (c1 >= 'a' && c1 <= 'z') c1 -= 'a' + 'A'; if (c2 >= 'a' && c2 <= 'z') c2 -= 'a' + 'A'; if (c2 < c1) return -1; else if (c2 > c1) return 1; c1 = *(++s1); c2 = *(++s2); } return 0; } -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/source/fcollada/src/FCollada/FUtils/FUAssert.cpp 0ad-0.0.23-alpha/libraries/source/fcollada/src/FCollada/FUtils/FUAssert.cpp ---- original/0ad-0.0.23-alpha/libraries/source/fcollada/src/FCollada/FUtils/FUAssert.cpp 2017-07-10 21:53:47.007864320 +0000 -+++ 0ad-0.0.23-alpha/libraries/source/fcollada/src/FCollada/FUtils/FUAssert.cpp 2019-01-09 17:21:48.744751104 +0000 +diff --git a/libraries/source/fcollada/src/FCollada/FUtils/FUAssert.cpp b/libraries/source/fcollada/src/FCollada/FUtils/FUAssert.cpp +index ba5f3d5..4cc2601 100644 +--- a/libraries/source/fcollada/src/FCollada/FUtils/FUAssert.cpp ++++ b/libraries/source/fcollada/src/FCollada/FUtils/FUAssert.cpp @@ -12,8 +12,12 @@ #include "FUAssert.h" - + #ifndef WIN32 + #ifdef __HAIKU__ + #include @@ -370,12 +864,13 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/s #include "sys/signal.h" // Used for throw(SIGTRAP) on UNIX-like systems #endif +#endif - + #ifdef __APPLE__ #include -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/source/fcollada/src/FCollada/FUtils/FUPluginManager.cpp 0ad-0.0.23-alpha/libraries/source/fcollada/src/FCollada/FUtils/FUPluginManager.cpp ---- original/0ad-0.0.23-alpha/libraries/source/fcollada/src/FCollada/FUtils/FUPluginManager.cpp 2010-04-19 21:56:45.003932160 +0000 -+++ 0ad-0.0.23-alpha/libraries/source/fcollada/src/FCollada/FUtils/FUPluginManager.cpp 2019-01-09 17:27:47.778567680 +0000 +diff --git a/libraries/source/fcollada/src/FCollada/FUtils/FUPluginManager.cpp b/libraries/source/fcollada/src/FCollada/FUtils/FUPluginManager.cpp +index 88308d4..abb06f5 100644 +--- a/libraries/source/fcollada/src/FCollada/FUtils/FUPluginManager.cpp ++++ b/libraries/source/fcollada/src/FCollada/FUtils/FUPluginManager.cpp @@ -27,6 +27,9 @@ #elif defined(__APPLE__) || defined(LINUX) #include @@ -384,11 +879,11 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/s +#if defined(__HAIKU__) + #include #endif //WIN32 - + // -@@ -129,6 +132,9 @@ +@@ -129,6 +132,9 @@ void FUPluginManager::LoadPluginsInFolderName(const fstring& folderName, const f } - + #elif defined(__APPLE__) || defined(LINUX) + #ifdef __HAIKU__ + struct stat s; @@ -396,7 +891,7 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/s fm::string s_filter = TO_STRING(filter); if (s_filter.length() > 0 && s_filter.front() == '*') s_filter.erase(0, 1); if (s_filter.length() > 0 && s_filter.back() == '*') s_filter.pop_back(); -@@ -139,7 +145,12 @@ +@@ -139,7 +145,12 @@ void FUPluginManager::LoadPluginsInFolderName(const fstring& folderName, const f dirent* directoryEntry; while ((directoryEntry = readdir(directory)) != NULL) { @@ -409,22 +904,24 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/s if (strstr((const char*) directoryEntry->d_name, s_filter.c_str()) != NULL) { // We have a match. ---- original/0ad-0.0.23-alpha/libraries/source/fcollada/src/FCollada/FUtils/FUStringBuilder.h 2012-06-04 21:33:15.005505024 +0000 -+++ 0ad-0.0.23-alpha/libraries/source/fcollada/src/FCollada/FUtils/FUStringBuilder.h 2019-01-09 17:18:53.740032512 +0000 -@@ -135,7 +135,7 @@ +diff --git a/libraries/source/fcollada/src/FCollada/FUtils/FUStringBuilder.h b/libraries/source/fcollada/src/FCollada/FUtils/FUStringBuilder.h +index 781885b..6b93e29 100644 +--- a/libraries/source/fcollada/src/FCollada/FUtils/FUStringBuilder.h ++++ b/libraries/source/fcollada/src/FCollada/FUtils/FUStringBuilder.h +@@ -135,7 +135,7 @@ public: #else - inline void append(unsigned int i) { append((uint32) i); } /**< See above. */ + inline void append(unsigned int i) { append((uint32) i); } /**< See above. */ #endif -#elif defined(__APPLE__) || defined(__OpenBSD__) +#elif defined(__APPLE__) || defined(__OpenBSD__) || (defined(__HAIKU__) && defined(__i386__)) - inline void append(size_t i) { append((uint64)i); } + inline void append(size_t i) { append((uint64)i); } #endif // defined(WIN32) - - -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/source/nvtt/src/src/nvcore/Debug.cpp 0ad-0.0.23-alpha/libraries/source/nvtt/src/src/nvcore/Debug.cpp ---- original/0ad-0.0.23-alpha/libraries/source/nvtt/src/src/nvcore/Debug.cpp 2015-07-21 15:53:21.056623104 +0000 -+++ 0ad-0.0.23-alpha/libraries/source/nvtt/src/src/nvcore/Debug.cpp 2019-01-09 19:09:51.894435328 +0000 -@@ -221,6 +221,14 @@ + +diff --git a/libraries/source/nvtt/src/src/nvcore/Debug.cpp b/libraries/source/nvtt/src/src/nvcore/Debug.cpp +index 7aa119e..33fedcc 100644 +--- a/libraries/source/nvtt/src/src/nvcore/Debug.cpp ++++ b/libraries/source/nvtt/src/src/nvcore/Debug.cpp +@@ -221,6 +221,14 @@ namespace ucontext_t * ucp = (ucontext_t *)secret; return (void *)ucp->sc_eip; # endif @@ -439,9 +936,10 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/s # else # if NV_CPU_X86_64 // #define REG_RIP REG_INDEX(rip) // seems to be 16 -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/source/nvtt/src/src/nvcore/nvcore.h 0ad-0.0.23-alpha/libraries/source/nvtt/src/src/nvcore/nvcore.h ---- original/0ad-0.0.23-alpha/libraries/source/nvtt/src/src/nvcore/nvcore.h 2015-07-21 15:53:21.057933824 +0000 -+++ 0ad-0.0.23-alpha/libraries/source/nvtt/src/src/nvcore/nvcore.h 2019-06-05 08:42:21.010485760 +0000 +diff --git a/libraries/source/nvtt/src/src/nvcore/nvcore.h b/libraries/source/nvtt/src/src/nvcore/nvcore.h +index 5cd1565..2634cfc 100644 +--- a/libraries/source/nvtt/src/src/nvcore/nvcore.h ++++ b/libraries/source/nvtt/src/src/nvcore/nvcore.h @@ -58,6 +58,9 @@ # define NV_OS_WIN32 1 #elif defined POSH_OS_WIN64 @@ -452,13 +950,14 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/s #else # error "Unsupported OS" #endif -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/source/nvtt/src/src/nvcore/poshlib/posh.h 0ad-0.0.23-alpha/libraries/source/nvtt/src/src/nvcore/poshlib/posh.h ---- original/0ad-0.0.23-alpha/libraries/source/nvtt/src/src/nvcore/poshlib/posh.h 2015-07-21 15:53:21.057671680 +0000 -+++ 0ad-0.0.23-alpha/libraries/source/nvtt/src/src/nvcore/poshlib/posh.h 2019-01-09 19:11:56.499384320 +0000 -@@ -303,6 +303,11 @@ +diff --git a/libraries/source/nvtt/src/src/nvcore/poshlib/posh.h b/libraries/source/nvtt/src/src/nvcore/poshlib/posh.h +index 2a178ab..a0110d0 100644 +--- a/libraries/source/nvtt/src/src/nvcore/poshlib/posh.h ++++ b/libraries/source/nvtt/src/src/nvcore/poshlib/posh.h +@@ -303,6 +303,11 @@ Metrowerks: # define POSH_OS_STRING "OpenBSD" #endif - + +#if defined __HAIKU__ +# define POSH_OS_HAIKU 1 +# define POSH_OS_STRING "Haiku" @@ -467,11 +966,12 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/s #if defined __CYGWIN32__ # define POSH_OS_CYGWIN32 1 # define POSH_OS_STRING "Cygwin" -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/source/nvtt/src/src/nvimage/ImageIO.cpp 0ad-0.0.23-alpha/libraries/source/nvtt/src/src/nvimage/ImageIO.cpp ---- original/0ad-0.0.23-alpha/libraries/source/nvtt/src/src/nvimage/ImageIO.cpp 2016-06-11 16:33:18.005767168 +0000 -+++ 0ad-0.0.23-alpha/libraries/source/nvtt/src/src/nvimage/ImageIO.cpp 2019-06-05 08:46:00.321126400 +0000 -@@ -28,7 +28,17 @@ - +diff --git a/libraries/source/nvtt/src/src/nvimage/ImageIO.cpp b/libraries/source/nvtt/src/src/nvimage/ImageIO.cpp +index e7a14f1..56b8724 100644 +--- a/libraries/source/nvtt/src/src/nvimage/ImageIO.cpp ++++ b/libraries/source/nvtt/src/src/nvimage/ImageIO.cpp +@@ -28,7 +28,17 @@ extern "C" { + #if defined(HAVE_TIFF) # define _TIFF_DATA_TYPEDEFS_ +#if defined(__HAIKU__) @@ -486,79 +986,13 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/s +# define TRUE_OLD TRUE +#endif #endif - + #if defined(HAVE_OPENEXR) -diff -urdN -E -b -w -B original/0ad-0.0.23-alpha/libraries/source/spidermonkey/build.sh 0ad-0.0.23-alpha/libraries/source/spidermonkey/build.sh ---- original/0ad-0.0.23-alpha/libraries/source/spidermonkey/build.sh 2016-10-04 15:01:34.062914560 +0000 -+++ 0ad-0.0.23-alpha/libraries/source/spidermonkey/build.sh 2019-06-09 07:59:56.329515008 +0000 -@@ -103,6 +103,54 @@ - perl -i.bak -pe 's/(SHARED_LIBRARY_NAME\s+=).*/$1 '\''mozjs38-ps-debug'\''/' moz.build - mkdir -p build-debug - cd build-debug -+ -+fixHaikuBuild() -+{ -+ baseDir=$(pwd) -+ -+ # HACK: HaikuPorter does not work with pip and virtual env at the moment. -+ mkdir -p _virtualenv -+ mkdir -p _virtualenv/non-packaged -+ mkdir -p _virtualenv/non-packaged/lib/ -+ mkdir -p _virtualenv/non-packaged/lib/python2.7/ -+ mkdir -p _virtualenv/non-packaged/lib/python2.7/site-packages/ -+ cd _virtualenv/non-packaged/lib/python2.7/site-packages/ -+ -+ echo testing/marionette/transport > marionette_transport.pth -+ echo testing/marionette/driver > marionette_driver.pth -+ echo testing/marionette/client > marionette.pth -+ echo python/blessings > blessings.pth -+ echo python/configobj > configobj.pth -+ echo python/jsmin > jsmin.pth -+ echo python/mach > mach.pth -+ echo python/mozbuild > mozbuild.pth -+ echo build/pymake > pymake.pth -+ #optional:setup.py:python/psutil:build_ext:--inplace -+ #optional:psutil.pth:python/psutil -+ echo python/which > which.pth -+ echo other-licenses/ply/ > ply.pth -+ echo python/mock-1.0.0 > mock.pth -+ echo build > mozilla.pth -+ echo config > mozilla.pth -+ echo xpcom/typelib/xpt/tools >> mozilla.pth -+ echo dom/bindings >> mozilla.pth -+ echo dom/bindings/parser >> mozilla.pth -+ echo layout/tools/reftest >> mozilla.pth -+ echo tools/docs > moztreedocs.pth -+ #copy:build/buildconfig.py -+ #packages.txt:testing/mozbase/packages.txt -+ #objdir:build -+ echo media/webrtc/trunk/tools/gyp/pylib > gyp.pth -+ echo python/pyasn1 > pyasn1.pth -+ echo python/bitstring > bitstring.pth -+ echo python/redo > redo.pth -+ echo python/requests > requests.pth -+ -+ cd $baseDir -+} -+ -+fixHaikuBuild -+ - CXXFLAGS="${CXXFLAGS} ${TLCXXFLAGS}" ../configure ${CONF_OPTS} --with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES" --enable-debug --disable-optimize --enable-js-diagnostics --enable-gczeal - ${MAKE} ${MAKE_OPTS} - cd .. -@@ -110,6 +158,9 @@ - perl -i.bak -pe 's/(SHARED_LIBRARY_NAME\s+=).*/$1 '\''mozjs38-ps-release'\''/' moz.build - mkdir -p build-release - cd build-release -+ -+fixHaikuBuild -+ - CXXFLAGS="${CXXFLAGS} ${TLCXXFLAGS}" ../configure ${CONF_OPTS} --with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES" --enable-optimize # --enable-gczeal --enable-debug-symbols - ${MAKE} ${MAKE_OPTS} - cd .. -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/source/spidermonkey/FixHaikuBuild.diff 0ad-0.0.23-alpha/libraries/source/spidermonkey/FixHaikuBuild.diff ---- original/0ad-0.0.23-alpha/libraries/source/spidermonkey/FixHaikuBuild.diff 1970-01-01 00:00:00.000000000 +0000 -+++ 0ad-0.0.23-alpha/libraries/source/spidermonkey/FixHaikuBuild.diff 2019-06-05 14:51:06.494665728 +0000 +diff --git a/libraries/source/spidermonkey/FixHaikuBuild.diff b/libraries/source/spidermonkey/FixHaikuBuild.diff +new file mode 100644 +index 0000000..74d6f47 +--- /dev/null ++++ b/libraries/source/spidermonkey/FixHaikuBuild.diff @@ -0,0 +1,197 @@ +diff -ur mozjs-38.0.0-old/js/src/asmjs/AsmJSSignalHandlers.cpp mozjs-38.0.0-new/js/src/asmjs/AsmJSSignalHandlers.cpp +--- mozjs-38.0.0-old/js/src/asmjs/AsmJSSignalHandlers.cpp 2015-09-17 20:12:18.030670848 +0000 @@ -757,20 +1191,91 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/s ++ ]""" + else: + sys.exit('platform %s is not supported' % sys.platform) -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/libraries/source/spidermonkey/patch.sh 0ad-0.0.23-alpha/libraries/source/spidermonkey/patch.sh ---- original/0ad-0.0.23-alpha/libraries/source/spidermonkey/patch.sh 2017-09-13 00:10:27.062652416 +0000 -+++ 0ad-0.0.23-alpha/libraries/source/spidermonkey/patch.sh 2019-01-09 17:51:48.153092096 +0000 -@@ -53,3 +53,6 @@ +diff --git a/libraries/source/spidermonkey/build.sh b/libraries/source/spidermonkey/build.sh +index 18202e7..c1473f2 100755 +--- a/libraries/source/spidermonkey/build.sh ++++ b/libraries/source/spidermonkey/build.sh +@@ -103,6 +103,54 @@ rm -rf build-release + perl -i.bak -pe 's/(SHARED_LIBRARY_NAME\s+=).*/$1 '\''mozjs38-ps-debug'\''/' moz.build + mkdir -p build-debug + cd build-debug ++ ++fixHaikuBuild() ++{ ++ baseDir=$(pwd) ++ ++ # HACK: HaikuPorter does not work with pip and virtual env at the moment. ++ mkdir -p _virtualenv ++ mkdir -p _virtualenv/non-packaged ++ mkdir -p _virtualenv/non-packaged/lib/ ++ mkdir -p _virtualenv/non-packaged/lib/python2.7/ ++ mkdir -p _virtualenv/non-packaged/lib/python2.7/site-packages/ ++ cd _virtualenv/non-packaged/lib/python2.7/site-packages/ ++ ++ echo testing/marionette/transport > marionette_transport.pth ++ echo testing/marionette/driver > marionette_driver.pth ++ echo testing/marionette/client > marionette.pth ++ echo python/blessings > blessings.pth ++ echo python/configobj > configobj.pth ++ echo python/jsmin > jsmin.pth ++ echo python/mach > mach.pth ++ echo python/mozbuild > mozbuild.pth ++ echo build/pymake > pymake.pth ++ #optional:setup.py:python/psutil:build_ext:--inplace ++ #optional:psutil.pth:python/psutil ++ echo python/which > which.pth ++ echo other-licenses/ply/ > ply.pth ++ echo python/mock-1.0.0 > mock.pth ++ echo build > mozilla.pth ++ echo config > mozilla.pth ++ echo xpcom/typelib/xpt/tools >> mozilla.pth ++ echo dom/bindings >> mozilla.pth ++ echo dom/bindings/parser >> mozilla.pth ++ echo layout/tools/reftest >> mozilla.pth ++ echo tools/docs > moztreedocs.pth ++ #copy:build/buildconfig.py ++ #packages.txt:testing/mozbase/packages.txt ++ #objdir:build ++ echo media/webrtc/trunk/tools/gyp/pylib > gyp.pth ++ echo python/pyasn1 > pyasn1.pth ++ echo python/bitstring > bitstring.pth ++ echo python/redo > redo.pth ++ echo python/requests > requests.pth ++ ++ cd $baseDir ++} ++ ++fixHaikuBuild ++ + CXXFLAGS="${CXXFLAGS} ${TLCXXFLAGS}" ../configure ${CONF_OPTS} --with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES" --enable-debug --disable-optimize --enable-js-diagnostics --enable-gczeal + ${MAKE} ${MAKE_OPTS} + cd .. +@@ -110,6 +158,9 @@ cd .. + perl -i.bak -pe 's/(SHARED_LIBRARY_NAME\s+=).*/$1 '\''mozjs38-ps-release'\''/' moz.build + mkdir -p build-release + cd build-release ++ ++fixHaikuBuild ++ + CXXFLAGS="${CXXFLAGS} ${TLCXXFLAGS}" ../configure ${CONF_OPTS} --with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES" --enable-optimize # --enable-gczeal --enable-debug-symbols + ${MAKE} ${MAKE_OPTS} + cd .. +diff --git a/libraries/source/spidermonkey/patch.sh b/libraries/source/spidermonkey/patch.sh +index b10d82f..28faab9 100644 +--- a/libraries/source/spidermonkey/patch.sh ++++ b/libraries/source/spidermonkey/patch.sh +@@ -53,3 +53,6 @@ patch -p1 < ../FixTracelogger.diff # Based on: https://svnweb.freebsd.org/ports/head/sysutils/py-psutil121/files/patch-_psutil_bsd.c?revision=436575&view=markup # Related: https://bugzilla.mozilla.org/show_bug.cgi?id=1238983 patch -p0 < ../FixpsutilFreeBSD.diff + +# Fixes the build on Haiku by adding it as a recognised platform +patch -p1 < ../FixHaikuBuild.diff -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/lib/allocators/page_aligned.cpp 0ad-0.0.23-alpha/source/lib/allocators/page_aligned.cpp ---- original/0ad-0.0.23-alpha/source/lib/allocators/page_aligned.cpp 2018-03-10 09:58:53.013107200 +0000 -+++ 0ad-0.0.23-alpha/source/lib/allocators/page_aligned.cpp 2019-06-04 15:27:05.314310656 +0000 -@@ -49,7 +49,11 @@ +diff --git a/source/lib/allocators/page_aligned.cpp b/source/lib/allocators/page_aligned.cpp +index 4dea320..6bc326b 100644 +--- a/source/lib/allocators/page_aligned.cpp ++++ b/source/lib/allocators/page_aligned.cpp +@@ -49,7 +49,11 @@ static const int mmap_flags = MAP_PRIVATE|MAP_ANONYMOUS; Status mem_Reserve(size_t size, u8** pp) { errno = 0; @@ -782,7 +1287,7 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/lib/ *pp = (u8*)ret; return StatusFromMap(ret); } -@@ -76,7 +80,11 @@ +@@ -76,7 +80,11 @@ Status mem_Commit(u8* p, size_t size, int prot) Status mem_Decommit(u8* p, size_t size) { errno = 0; @@ -793,53 +1298,87 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/lib/ +#endif return StatusFromMap(ret); } - -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/lib/config2.h 0ad-0.0.23-alpha/source/lib/config2.h ---- original/0ad-0.0.23-alpha/source/lib/config2.h 2017-07-10 14:26:24.022282240 +0000 -+++ 0ad-0.0.23-alpha/source/lib/config2.h 2019-06-04 15:30:31.672923648 +0000 + +diff --git a/source/lib/config2.h b/source/lib/config2.h +index 19ea91e..bc8b89c 100644 +--- a/source/lib/config2.h ++++ b/source/lib/config2.h @@ -60,7 +60,7 @@ // work around a bug introduced in Linux 2.6.38 // (http://www.wildfiregames.com/forum/index.php?showtopic=14561&view=findpost&p=217710) // OpenBSD doesn't provide aio.h so we disable its use -# if OS_LINUX || OS_OPENBSD -+# if OS_LINUX || OS_OPENBSD || __HAIKU__ ++# if OS_LINUX || OS_OPENBSD || OS_HAIKU # define CONFIG2_FILE_ENABLE_AIO 0 # else # define CONFIG2_FILE_ENABLE_AIO 1 -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/lib/posix/posix_aio.h 0ad-0.0.23-alpha/source/lib/posix/posix_aio.h ---- original/0ad-0.0.23-alpha/source/lib/posix/posix_aio.h 2017-07-10 14:26:24.024117248 +0000 -+++ 0ad-0.0.23-alpha/source/lib/posix/posix_aio.h 2019-06-04 14:55:11.776208384 +0000 +diff --git a/source/lib/posix/posix_aio.h b/source/lib/posix/posix_aio.h +index 1246840..16ac282 100644 +--- a/source/lib/posix/posix_aio.h ++++ b/source/lib/posix/posix_aio.h @@ -30,7 +30,7 @@ - + #if OS_WIN # include "lib/sysdep/os/win/wposix/waio.h" -#elif OS_ANDROID || OS_OPENBSD -+#elif OS_ANDROID || OS_OPENBSD || __HAIKU__ ++#elif OS_ANDROID || OS_OPENBSD || OS_HAIKU // Android doesn't provide aio.h. We don't actually use aio on Linuxes (see // CONFIG2_FILE_ENABLE_AIO) but we use its symbols and structs, so define // them here -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/lib/secure_crt.h 0ad-0.0.23-alpha/source/lib/secure_crt.h ---- original/0ad-0.0.23-alpha/source/lib/secure_crt.h 2017-07-10 14:26:24.047972352 +0000 -+++ 0ad-0.0.23-alpha/source/lib/secure_crt.h 2019-06-04 14:47:13.927727616 +0000 -@@ -47,13 +47,13 @@ +diff --git a/source/lib/secure_crt.h b/source/lib/secure_crt.h +index 1eaa8f7..300a88f 100644 +--- a/source/lib/secure_crt.h ++++ b/source/lib/secure_crt.h +@@ -47,13 +47,13 @@ namespace ERR #if EMULATE_SECURE_CRT - + // (conflicts with glibc definitions) -#if !OS_UNIX || OS_MACOSX || OS_OPENBSD -+#if !OS_UNIX || OS_MACOSX || OS_OPENBSD || __HAIKU__ ++#if !OS_UNIX || OS_MACOSX || OS_OPENBSD || OS_HAIKU // return length [in characters] of a string, not including the trailing // null character. to protect against access violations, only the // first characters are examined; if the null character is // not encountered by then, is returned. // strnlen is available on OpenBSD -#if !OS_OPENBSD -+#if !OS_OPENBSD && !__HAIKU__ ++#if !OS_OPENBSD && !OS_HAIKU extern size_t strnlen(const char* str, size_t max_len); #endif extern size_t wcsnlen(const wchar_t* str, size_t max_len); -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/lib/sysdep/os/haiku/dir_watch.cpp 0ad-0.0.23-alpha/source/lib/sysdep/os/haiku/dir_watch.cpp ---- original/0ad-0.0.23-alpha/source/lib/sysdep/os/haiku/dir_watch.cpp 1970-01-01 00:00:00.000000000 +0000 -+++ 0ad-0.0.23-alpha/source/lib/sysdep/os/haiku/dir_watch.cpp 2019-06-05 11:00:18.633077760 +0000 +diff --git a/source/lib/sysdep/os.h b/source/lib/sysdep/os.h +index a958b83..cb8b1e3 100644 +--- a/source/lib/sysdep/os.h ++++ b/source/lib/sysdep/os.h +@@ -84,11 +84,11 @@ + #else + # define OS_SOLARIS 0 + #endif +-// BeOS +-#if defined(__BEOS__) +-# define OS_BEOS 1 ++// Haiku ++#if defined(__HAIKU__) ++# define OS_HAIKU 1 + #else +-# define OS_BEOS 0 ++# define OS_HAIKU 0 + #endif + // Mac OS 9 or below + #if defined(macintosh) +@@ -112,7 +112,7 @@ + // convenience: additionally set OS_UNIX for Unix-based OSes + // note: doing this in an separate section instead of adding the extra define + // to all affected OSes saves a few undefs or macro redefinition warnings. +-#if OS_LINUX || OS_MACOSX || OS_BSD || OS_SOLARIS ++#if OS_LINUX || OS_MACOSX || OS_BSD || OS_SOLARIS || OS_HAIKU + # undef OS_UNIX + # define OS_UNIX 1 + #endif +diff --git a/source/lib/sysdep/os/haiku/dir_watch.cpp b/source/lib/sysdep/os/haiku/dir_watch.cpp +new file mode 100644 +index 0000000..749946e +--- /dev/null ++++ b/source/lib/sysdep/os/haiku/dir_watch.cpp @@ -0,0 +1,36 @@ +/* Copyright (C) 2012 Wildfire Games. + * @@ -877,9 +1416,11 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/lib/ +{ + return INFO::OK; +} -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/lib/sysdep/os/haiku/haiku.cpp 0ad-0.0.23-alpha/source/lib/sysdep/os/haiku/haiku.cpp ---- original/0ad-0.0.23-alpha/source/lib/sysdep/os/haiku/haiku.cpp 1970-01-01 00:00:00.000000000 +0000 -+++ 0ad-0.0.23-alpha/source/lib/sysdep/os/haiku/haiku.cpp 2019-06-07 20:44:11.748683264 +0000 +diff --git a/source/lib/sysdep/os/haiku/haiku.cpp b/source/lib/sysdep/os/haiku/haiku.cpp +new file mode 100644 +index 0000000..a584af8 +--- /dev/null ++++ b/source/lib/sysdep/os/haiku/haiku.cpp @@ -0,0 +1,147 @@ +/* Copyright (C) 2014 Wildfire Games. + * @@ -1028,9 +1569,11 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/lib/ + return INFO::OK; + } +} -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/lib/sysdep/os/haiku/hcpu.cpp 0ad-0.0.23-alpha/source/lib/sysdep/os/haiku/hcpu.cpp ---- original/0ad-0.0.23-alpha/source/lib/sysdep/os/haiku/hcpu.cpp 1970-01-01 00:00:00.000000000 +0000 -+++ 0ad-0.0.23-alpha/source/lib/sysdep/os/haiku/hcpu.cpp 2019-06-05 11:02:53.649854976 +0000 +diff --git a/source/lib/sysdep/os/haiku/hcpu.cpp b/source/lib/sysdep/os/haiku/hcpu.cpp +new file mode 100644 +index 0000000..2c966d2 +--- /dev/null ++++ b/source/lib/sysdep/os/haiku/hcpu.cpp @@ -0,0 +1,120 @@ +/* Copyright (C) 2012 Wildfire Games. + * @@ -1152,9 +1695,11 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/lib/ + + return INFO::OK; +} -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/lib/sysdep/os/haiku/hdbg.cpp 0ad-0.0.23-alpha/source/lib/sysdep/os/haiku/hdbg.cpp ---- original/0ad-0.0.23-alpha/source/lib/sysdep/os/haiku/hdbg.cpp 1970-01-01 00:00:00.000000000 +0000 -+++ 0ad-0.0.23-alpha/source/lib/sysdep/os/haiku/hdbg.cpp 2019-06-05 10:59:07.954466304 +0000 +diff --git a/source/lib/sysdep/os/haiku/hdbg.cpp b/source/lib/sysdep/os/haiku/hdbg.cpp +new file mode 100644 +index 0000000..4030b3e +--- /dev/null ++++ b/source/lib/sysdep/os/haiku/hdbg.cpp @@ -0,0 +1,46 @@ +/* Copyright (C) 2012 Wildfire Games. + * @@ -1202,10 +1747,11 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/lib/ +{ + // Currently unimplemented +} -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/lib/sysdep/os/unix/unix_executable_pathname.cpp 0ad-0.0.23-alpha/source/lib/sysdep/os/unix/unix_executable_pathname.cpp ---- original/0ad-0.0.23-alpha/source/lib/sysdep/os/unix/unix_executable_pathname.cpp 2017-07-10 14:26:24.037486592 +0000 -+++ 0ad-0.0.23-alpha/source/lib/sysdep/os/unix/unix_executable_pathname.cpp 2019-06-05 11:27:05.633077760 +0000 -@@ -35,7 +35,7 @@ +diff --git a/source/lib/sysdep/os/unix/unix_executable_pathname.cpp b/source/lib/sysdep/os/unix/unix_executable_pathname.cpp +index fc4acb1..a62b396 100644 +--- a/source/lib/sysdep/os/unix/unix_executable_pathname.cpp ++++ b/source/lib/sysdep/os/unix/unix_executable_pathname.cpp +@@ -35,7 +35,7 @@ OsPath unix_ExecutablePathname() // Find the executable's filename Dl_info dl_info; memset(&dl_info, 0, sizeof(dl_info)); @@ -1213,81 +1759,57 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/lib/ + if (!dladdr((void *)sys_ExecutablePathname, &dl_info) || !dl_info.dli_fname) return OsPath(); const char* path = dl_info.dli_fname; - -@@ -53,7 +53,7 @@ + +@@ -53,7 +53,7 @@ OsPath unix_ExecutablePathname() if (strchr(path, '/')) { char cwd[PATH_MAX]; - if (!T::getcwd(cwd, PATH_MAX)) + if (!getcwd(cwd, PATH_MAX)) return OsPath(); - + char absolute[PATH_MAX]; -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/lib/sysdep/os/unix/uvm.cpp 0ad-0.0.23-alpha/source/lib/sysdep/os/unix/uvm.cpp ---- original/0ad-0.0.23-alpha/source/lib/sysdep/os/unix/uvm.cpp 2017-07-10 14:26:24.038273024 +0000 -+++ 0ad-0.0.23-alpha/source/lib/sysdep/os/unix/uvm.cpp 2019-06-04 16:26:42.716701696 +0000 -@@ -40,7 +40,11 @@ - void* ReserveAddressSpace(size_t size, size_t UNUSED(commitSize), PageType UNUSED(pageType), int UNUSED(prot)) - { - errno = 0; -+#if !defined(__HAIKU__) - void* p = mmap(0, size, PROT_NONE, mmap_flags|MAP_NORESERVE, -1, 0); -+#else -+ void* p = mmap(0, size, PROT_NONE, mmap_flags, -1, 0); -+#endif - if(p == MAP_FAILED) - return 0; - return p; -@@ -77,7 +81,11 @@ - bool Decommit(uintptr_t address, size_t size) - { - errno = 0; -+#if !defined(__HAIKU__) - if(mmap((void*)address, size, PROT_NONE, mmap_flags|MAP_NORESERVE|MAP_FIXED, -1, 0) == MAP_FAILED) -+#else -+ if(mmap((void*)address, size, PROT_NONE, mmap_flags|MAP_FIXED, -1, 0) == MAP_FAILED) -+#endif - return false; - return true; - } -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/lib/sysdep/os.h 0ad-0.0.23-alpha/source/lib/sysdep/os.h ---- original/0ad-0.0.23-alpha/source/lib/sysdep/os.h 2017-07-10 14:26:24.025952256 +0000 -+++ 0ad-0.0.23-alpha/source/lib/sysdep/os.h 2019-06-04 15:55:52.065273856 +0000 -@@ -103,7 +103,7 @@ - # define OS_AMIGA 0 +diff --git a/source/lib/sysdep/os/unix/uvm.cpp b/source/lib/sysdep/os/unix/uvm.cpp +index 8a3f81e..e777c83 100644 +--- a/source/lib/sysdep/os/unix/uvm.cpp ++++ b/source/lib/sysdep/os/unix/uvm.cpp +@@ -32,6 +32,9 @@ + #ifndef MAP_ANONYMOUS + # define MAP_ANONYMOUS MAP_ANON #endif - // Unix-based --#if defined(unix) || defined(__unix) || defined(__unix__) || defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) -+#if defined(unix) || defined(__unix) || defined(__unix__) || defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) || defined(__HAIKU__) - # define OS_UNIX 1 - #else - # define OS_UNIX 0 -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/main.cpp 0ad-0.0.23-alpha/source/main.cpp ---- original/0ad-0.0.23-alpha/source/main.cpp 2018-05-08 10:03:46.009175040 +0000 -+++ 0ad-0.0.23-alpha/source/main.cpp 2019-06-05 12:26:15.713555968 +0000 -@@ -657,7 +657,8 @@ - ++#ifndef MAP_NORESERVE ++# define MAP_NORESERVE 0 ++#endif + + static const int mmap_flags = MAP_PRIVATE|MAP_ANONYMOUS; + +diff --git a/source/main.cpp b/source/main.cpp +index bd00fd3..3edf8e5 100644 +--- a/source/main.cpp ++++ b/source/main.cpp +@@ -659,7 +659,7 @@ extern "C" __attribute__((visibility ("default"))) int main(int argc, char* argv + extern "C" int main(int argc, char* argv[]) { -#if OS_UNIX -+ // Haiku only has a root user. -+#if OS_UNIX && !defined(__HAIKU__) ++#if OS_UNIX && !OS_HAIKU // Don't allow people to run the game with root permissions, // because bad things can happen, check before we do anything if (geteuid() == 0) -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/ps/GameSetup/GameSetup.cpp 0ad-0.0.23-alpha/source/ps/GameSetup/GameSetup.cpp ---- original/0ad-0.0.23-alpha/source/ps/GameSetup/GameSetup.cpp 2018-05-08 09:45:54.051380224 +0000 -+++ 0ad-0.0.23-alpha/source/ps/GameSetup/GameSetup.cpp 2019-06-07 20:46:23.354156544 +0000 -@@ -87,7 +87,7 @@ +diff --git a/source/ps/GameSetup/GameSetup.cpp b/source/ps/GameSetup/GameSetup.cpp +index 255cac6..7e5557c 100644 +--- a/source/ps/GameSetup/GameSetup.cpp ++++ b/source/ps/GameSetup/GameSetup.cpp +@@ -88,7 +88,7 @@ #include "tools/atlas/GameInterface/GameLoop.h" #include "tools/atlas/GameInterface/View.h" - + -#if !(OS_WIN || OS_MACOSX || OS_ANDROID) // assume all other platforms use X11 for wxWidgets +#if !(OS_WIN || OS_MACOSX || OS_ANDROID || __HAIKU__) // assume all other platforms use X11 for wxWidgets #define MUST_INIT_X11 1 #include #else -@@ -787,7 +787,8 @@ +@@ -788,7 +788,8 @@ from_config: #if OS_UNIX static void FixLocales() { @@ -1297,13 +1819,14 @@ diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/ps/G // OS X requires a UTF-8 locale in LC_CTYPE so that *wprintf can handle // wide characters. Peculiarly the string "UTF-8" seems to be acceptable // despite not being a real locale, and it's conveniently language-agnostic, -diff -urdN -E -b -w -B original/0ad-0.0.23-alpha/source/ps/GameSetup/Paths.cpp 0ad-0.0.23-alpha/source/ps/GameSetup/Paths.cpp ---- original/0ad-0.0.23-alpha/source/ps/GameSetup/Paths.cpp 2016-11-23 13:02:58.051118080 +0000 -+++ 0ad-0.0.23-alpha/source/ps/GameSetup/Paths.cpp 2019-06-08 17:35:37.093585408 +0000 -@@ -141,12 +141,20 @@ +diff --git a/source/ps/GameSetup/Paths.cpp b/source/ps/GameSetup/Paths.cpp +index 474364e..bd51315 100644 +--- a/source/ps/GameSetup/Paths.cpp ++++ b/source/ps/GameSetup/Paths.cpp +@@ -141,12 +141,20 @@ Paths::Paths(const CmdLineArgs& args) const OsPath xdgConfig = XDG_Path("XDG_CONFIG_HOME", home, home/".config/" ) / subdirectoryName; const OsPath xdgCache = XDG_Path("XDG_CACHE_HOME", home, home/".cache/" ) / subdirectoryName; - + +#if !defined(__HAIKU__) // We don't make the game vs. user data distinction on Unix m_gameData = xdgData/""; @@ -1318,18 +1841,22 @@ diff -urdN -E -b -w -B original/0ad-0.0.23-alpha/source/ps/GameSetup/Paths.cpp 0 + m_config = m_userData / "config"/""; + m_logs = m_userData / "logs" / ""; +#endif - + #endif } -diff -urdN -E -b -w -B --strip-trailing-cr original/0ad-0.0.23-alpha/source/third_party/tinygettext/src/iconv.cpp 0ad-0.0.23-alpha/source/third_party/tinygettext/src/iconv.cpp ---- original/0ad-0.0.23-alpha/source/third_party/tinygettext/src/iconv.cpp 2015-12-08 18:05:11.039845888 +0000 -+++ 0ad-0.0.23-alpha/source/third_party/tinygettext/src/iconv.cpp 2019-06-05 19:13:12.000000000 +0000 -@@ -117,7 +117,7 @@ +diff --git a/source/third_party/tinygettext/src/iconv.cpp b/source/third_party/tinygettext/src/iconv.cpp +index 7712bdd..0fd73da 100644 +--- a/source/third_party/tinygettext/src/iconv.cpp ++++ b/source/third_party/tinygettext/src/iconv.cpp +@@ -117,7 +117,7 @@ IConv::convert(const std::string& text) char* outbuf = &result[0]; - + // Try to convert the text. - size_t ret = tinygettext_iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft); + size_t ret = tinygettext_iconv(cd, const_cast(&inbuf), &inbytesleft, &outbuf, &outbytesleft); if (ret == static_cast(-1)) { if (errno == EILSEQ || errno == EINVAL) +-- +2.17.1 + diff --git a/games-strategy/0ad_data/0ad_data-0.0.23b~alpha.recipe b/games-strategy/0ad_data/0ad_data-0.0.23b~alpha.recipe index df8299910..f3d8487a4 100644 --- a/games-strategy/0ad_data/0ad_data-0.0.23b~alpha.recipe +++ b/games-strategy/0ad_data/0ad_data-0.0.23b~alpha.recipe @@ -14,16 +14,10 @@ DISABLE_SOURCE_PACKAGE="yes" PROVIDES=" 0ad_data = $portVersion -" - -BUILD() -{ - true -} + " INSTALL() { - mkdir -p $dataDir mkdir -p $dataDir/0ad cp -R binaries/data/* $dataDir/0ad } diff --git a/games-strategy/0ad_data/0ad_data-0.0.23~alpha.recipe b/games-strategy/0ad_data/0ad_data-0.0.23~alpha.recipe deleted file mode 100644 index dd4d5972d..000000000 --- a/games-strategy/0ad_data/0ad_data-0.0.23~alpha.recipe +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY="O A.D. - Game Data" -DESCRIPTION="Data for the game 0 A.D." -HOMEPAGE="https://play0ad.com/" -COPYRIGHT="Wildfire Games" -LICENSE="0ADLicense" -REVISION="1" -SOURCE_URI="https://releases.wildfiregames.com/0ad-${portVersion/\~/-}-unix-data.tar.xz" -CHECKSUM_SHA256="fdbf774637252dbedf339fbe29b77d7d585ab53a9a5ddede56dd7b8fda66d8ac" -SOURCE_DIR="0ad-${portVersion/\~/-}" - -ARCHITECTURES="?any" - -DISABLE_SOURCE_PACKAGE="yes" - -PROVIDES=" - 0ad_data = $portVersion -" - -BUILD() -{ - true -} - -INSTALL() -{ - mkdir -p $dataDir - mkdir -p $dataDir/0ad - cp -R binaries/data/* $dataDir/0ad -}