update to Red Eclipse 1.5.5
This commit is contained in:
jsg
parent
54a93bc4d7
commit
1e89246adb
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.11 2015/07/29 04:04:04 jsg Exp $
|
||||
# $OpenBSD: Makefile,v 1.12 2016/07/30 15:41:37 jsg Exp $
|
||||
|
||||
ONLY_FOR_ARCHS= i386 amd64
|
||||
|
||||
@ -13,17 +13,19 @@ MAINTAINER= Jonathan Gray <jsg@openbsd.org>
|
||||
MULTI_PACKAGES= -main -data
|
||||
|
||||
N= redeclipse
|
||||
V= 1.5.3
|
||||
V= 1.5.5
|
||||
PKGNAME= ${N}-${V}
|
||||
PKGNAME-main= ${N}-${V}
|
||||
PKGNAME-data= ${N}-data-${V}
|
||||
|
||||
DISTFILES= redeclipse-{base/archive/v}${V}${EXTRACT_SUFX}
|
||||
|
||||
SM= acerspyro actors appleflap blendbrush caustics crosshairs elyvisions \
|
||||
fonts freezurbern john jojo jwin luckystrike maps mayhem mikeplus64 \
|
||||
misc nobiax particles philipk projectiles props skyboxes sounds \
|
||||
textures torley trak ulukai unnamed vanities vegetation weapons wicked
|
||||
|
||||
SM= acerspyro actors appleflap blendbrush caustics crosshairs dziq \
|
||||
elyvisions fonts freezurbern john jojo jwin luckystrike maps mayhem \
|
||||
mikeplus64 misc nieb nobiax particles philipk projectiles props \
|
||||
skyboxes snipergoth sounds textures torley trak ulukai unnamed \
|
||||
vanities vegetation weapons wicked
|
||||
|
||||
.for MOD in ${SM}
|
||||
DISTFILES+= redeclipse-data-${MOD}-{${MOD}/archive/v}${V}${EXTRACT_SUFX}
|
||||
@ -39,10 +41,11 @@ RUN_DEPENDS-main += ${BASE_PKGPATH},-data>=${V} \
|
||||
x11/gtk+3,-guic
|
||||
|
||||
BUILD_DEPENDS= graphics/GraphicsMagick
|
||||
LIB_DEPENDS-main= devel/sdl-mixer \
|
||||
devel/sdl-image \
|
||||
LIB_DEPENDS-main= devel/sdl2-mixer \
|
||||
devel/sdl2-image \
|
||||
net/enet>=1.3.12
|
||||
WANTLIB-main+= GL X11 SDL SDL_image SDL_mixer c enet m pthread stdc++ z
|
||||
WANTLIB-main+= GL X11 SDL2 SDL2_image SDL2_mixer c enet m pthread \
|
||||
stdc++ z
|
||||
|
||||
WRKDIST= ${WRKDIR}/base-${V}/src
|
||||
USE_GMAKE= Yes
|
||||
@ -55,7 +58,9 @@ INSTALL_TARGET= system-install
|
||||
post-extract:
|
||||
.for MOD in ${SM}
|
||||
rm -f ${WRKDIR}/${MOD}-${V}/.gitattributes
|
||||
rm -rf ${WRKDIR}/${MOD}-${V}/.github
|
||||
rm -f ${WRKDIR}/${MOD}-${V}/.gitignore
|
||||
rm -f ${WRKDIR}/${MOD}-${V}/.gitmodules
|
||||
rmdir ${WRKDIR}/base-${V}/data/${MOD}
|
||||
mv ${WRKDIR}/${MOD}-${V} ${WRKDIR}/base-${V}/data/${MOD}
|
||||
.endfor
|
||||
|
||||
@ -1,68 +1,74 @@
|
||||
SHA256 (redeclipse-1.5.3.tar.gz) = lLBHXHwWHU/bWanr4NdA7Aexk0q/NI141PEn82nZEvg=
|
||||
SHA256 (redeclipse-data-acerspyro-1.5.3.tar.gz) = GHGChqcimLCgFtFHUkvFMJTErTiXhZ7IQiExtazJvT8=
|
||||
SHA256 (redeclipse-data-actors-1.5.3.tar.gz) = NIJbW7f3m/lRjl5I8B7LcgzFWbuWlXW5PaBbUwXCCcs=
|
||||
SHA256 (redeclipse-data-appleflap-1.5.3.tar.gz) = BcWq6Sd574tv63TuOW0nABqoaSYQw1szQhQZ3Q0LxLI=
|
||||
SHA256 (redeclipse-data-blendbrush-1.5.3.tar.gz) = wPsyV/1Km0Jb+gFf8BJoB6+F262okiN2VonmGK19S3I=
|
||||
SHA256 (redeclipse-data-caustics-1.5.3.tar.gz) = JbA2aw5DQEnTgv3toLYuOKf9rfOY1xRxPYKZCPENuz8=
|
||||
SHA256 (redeclipse-data-crosshairs-1.5.3.tar.gz) = cy4Kh0rTnU7jKeS4K63Y47UTrUpab36lxcLTCkKDnm4=
|
||||
SHA256 (redeclipse-data-elyvisions-1.5.3.tar.gz) = KdhVQVF4lXjLzhdxjZEcNuNFPuO3ALlrTKC51PI5FGg=
|
||||
SHA256 (redeclipse-data-fonts-1.5.3.tar.gz) = uIJGo6GUr9Djko1EfZ5JyIac4VfABdyirXYQR5NE9io=
|
||||
SHA256 (redeclipse-data-freezurbern-1.5.3.tar.gz) = lmnKJaPN/69hcoKaHgTa1R9Dv0vZi3lNFXShjd7QwHg=
|
||||
SHA256 (redeclipse-data-john-1.5.3.tar.gz) = jQIlnQh4uRwsFrjDI/K7+PulIaVpT5uxYMpffDKwvNI=
|
||||
SHA256 (redeclipse-data-jojo-1.5.3.tar.gz) = qXtFoeCVwR8bm1w07S8o5kJ6eExW/AoUMohjilnMA2o=
|
||||
SHA256 (redeclipse-data-jwin-1.5.3.tar.gz) = U5hzoZy6/RBJmVlhkZl5Hrxv6rzeIMTbHpKY3qFMheQ=
|
||||
SHA256 (redeclipse-data-luckystrike-1.5.3.tar.gz) = IVFlZLqDJQfsuT8F0D5mK9TcCUTXvIALwRJ8ltlBuCM=
|
||||
SHA256 (redeclipse-data-maps-1.5.3.tar.gz) = caeexmXpkmhjeVK9iDr82gI0XJlESUgi/pa0VRHEELg=
|
||||
SHA256 (redeclipse-data-mayhem-1.5.3.tar.gz) = lanOe/qLxOONqBl++F5TDjEroEDPdyuumehHRcyVycI=
|
||||
SHA256 (redeclipse-data-mikeplus64-1.5.3.tar.gz) = V6kqv/U21FnkE9Qk6KlIwpUaf0dtuwCDG/VN3+3/Qs4=
|
||||
SHA256 (redeclipse-data-misc-1.5.3.tar.gz) = rsUGz2WUUqcXQw/mEE4GJOrFvVnyLGTKUDPWXLT8Fd4=
|
||||
SHA256 (redeclipse-data-nobiax-1.5.3.tar.gz) = FZ6YUn6pU+Gvj0mAitYfNNCBibcg4HBGP/iKSgRLNiI=
|
||||
SHA256 (redeclipse-data-particles-1.5.3.tar.gz) = dZtG4tjtwqyJPdj86IILIIeJ2bwsY2eds1NmuI0ejXE=
|
||||
SHA256 (redeclipse-data-philipk-1.5.3.tar.gz) = 6k2qLgLBO7uNC6GK19Pf3A85NV3Mw2xVa7rsiK6qE+g=
|
||||
SHA256 (redeclipse-data-projectiles-1.5.3.tar.gz) = 0r6xfnt5KHGNXE2WlyOAJ1I93WovFo2QC41ZnZPOsHU=
|
||||
SHA256 (redeclipse-data-props-1.5.3.tar.gz) = efR0Nn+Aj6pyk+c4UeAzGjVHYNsN0LjQYfHXS5IacOk=
|
||||
SHA256 (redeclipse-data-skyboxes-1.5.3.tar.gz) = 8X3zHIV6vXEGFZ6CupKyUtuM5o3yGokwI9MBfY0qyUM=
|
||||
SHA256 (redeclipse-data-sounds-1.5.3.tar.gz) = 68yWC14+zugOBK7IM1VU/9s27MAweRZmkDqFytRp3t4=
|
||||
SHA256 (redeclipse-data-textures-1.5.3.tar.gz) = pZxgTRNL8OgtMTQIeMR5AGDcgvekQXraHXeC2gmzrj8=
|
||||
SHA256 (redeclipse-data-torley-1.5.3.tar.gz) = RgfWC+cICwrFxu+AHxWNK6bnmYLphh7s3RVpilwtMbM=
|
||||
SHA256 (redeclipse-data-trak-1.5.3.tar.gz) = eOm7Ex/hRLUWzim+bJ9k8pkXMeSZNVdsqj7Zmcov03c=
|
||||
SHA256 (redeclipse-data-ulukai-1.5.3.tar.gz) = Y4+3rA4NjrHxPHoB0A0xznhEwG2JB60qIOpXGwlLO34=
|
||||
SHA256 (redeclipse-data-unnamed-1.5.3.tar.gz) = vX2hTZ5xXW3MJoeSH2aHOdC6RanwE1DBtTR+lWZIokI=
|
||||
SHA256 (redeclipse-data-vanities-1.5.3.tar.gz) = vNmg8iMUwLuY/Bk/GPBKPMnxqmuDxwoC3jS3ecwWbOE=
|
||||
SHA256 (redeclipse-data-vegetation-1.5.3.tar.gz) = wHbz9Qyqxb7FiJ/I4RAoiCt6Oc7oVgaEkYw6DrhHIo0=
|
||||
SHA256 (redeclipse-data-weapons-1.5.3.tar.gz) = I9cPto/jS6nJUvdLLsbKMLndqGZCSNsQ9bQ0y5w1Fr4=
|
||||
SHA256 (redeclipse-data-wicked-1.5.3.tar.gz) = D8WnXGsKKpyQpmTiueyViSizBZ8D6QIozKVH83ZTK2E=
|
||||
SIZE (redeclipse-1.5.3.tar.gz) = 10276808
|
||||
SIZE (redeclipse-data-acerspyro-1.5.3.tar.gz) = 2770259
|
||||
SIZE (redeclipse-data-actors-1.5.3.tar.gz) = 24772154
|
||||
SIZE (redeclipse-data-appleflap-1.5.3.tar.gz) = 988071
|
||||
SIZE (redeclipse-data-blendbrush-1.5.3.tar.gz) = 40517
|
||||
SIZE (redeclipse-data-caustics-1.5.3.tar.gz) = 778468
|
||||
SIZE (redeclipse-data-crosshairs-1.5.3.tar.gz) = 479725
|
||||
SIZE (redeclipse-data-elyvisions-1.5.3.tar.gz) = 36432734
|
||||
SIZE (redeclipse-data-fonts-1.5.3.tar.gz) = 271972
|
||||
SIZE (redeclipse-data-freezurbern-1.5.3.tar.gz) = 9401468
|
||||
SIZE (redeclipse-data-john-1.5.3.tar.gz) = 1186594
|
||||
SIZE (redeclipse-data-jojo-1.5.3.tar.gz) = 37789399
|
||||
SIZE (redeclipse-data-jwin-1.5.3.tar.gz) = 1415954
|
||||
SIZE (redeclipse-data-luckystrike-1.5.3.tar.gz) = 28148246
|
||||
SIZE (redeclipse-data-maps-1.5.3.tar.gz) = 133581561
|
||||
SIZE (redeclipse-data-mayhem-1.5.3.tar.gz) = 21465008
|
||||
SIZE (redeclipse-data-mikeplus64-1.5.3.tar.gz) = 17664644
|
||||
SIZE (redeclipse-data-misc-1.5.3.tar.gz) = 1288142
|
||||
SIZE (redeclipse-data-nobiax-1.5.3.tar.gz) = 278575
|
||||
SIZE (redeclipse-data-particles-1.5.3.tar.gz) = 1641320
|
||||
SIZE (redeclipse-data-philipk-1.5.3.tar.gz) = 93464931
|
||||
SIZE (redeclipse-data-projectiles-1.5.3.tar.gz) = 4418631
|
||||
SIZE (redeclipse-data-props-1.5.3.tar.gz) = 2227662
|
||||
SIZE (redeclipse-data-skyboxes-1.5.3.tar.gz) = 10623398
|
||||
SIZE (redeclipse-data-sounds-1.5.3.tar.gz) = 40401214
|
||||
SIZE (redeclipse-data-textures-1.5.3.tar.gz) = 15784653
|
||||
SIZE (redeclipse-data-torley-1.5.3.tar.gz) = 57187266
|
||||
SIZE (redeclipse-data-trak-1.5.3.tar.gz) = 67383735
|
||||
SIZE (redeclipse-data-ulukai-1.5.3.tar.gz) = 8599740
|
||||
SIZE (redeclipse-data-unnamed-1.5.3.tar.gz) = 77758424
|
||||
SIZE (redeclipse-data-vanities-1.5.3.tar.gz) = 5350729
|
||||
SIZE (redeclipse-data-vegetation-1.5.3.tar.gz) = 4901987
|
||||
SIZE (redeclipse-data-weapons-1.5.3.tar.gz) = 42886743
|
||||
SIZE (redeclipse-data-wicked-1.5.3.tar.gz) = 66675785
|
||||
SHA256 (redeclipse-1.5.5.tar.gz) = Jnmfod71KaEx9A4ZqT23iXugx7ke+B5tkSiag0oxg3Y=
|
||||
SHA256 (redeclipse-data-acerspyro-1.5.5.tar.gz) = 9x51dWBZmb8mioX4QrJpJUeaQCgPnE6PqTerWqIp2Gg=
|
||||
SHA256 (redeclipse-data-actors-1.5.5.tar.gz) = YTskYDbemNIjvYclpTKcfXNUS0dPLd6fDSgS8yOrlEk=
|
||||
SHA256 (redeclipse-data-appleflap-1.5.5.tar.gz) = BM9FN4LGqjnaJeYVC1h5FeI+ZdsEfuBho1Xp2f6L5cc=
|
||||
SHA256 (redeclipse-data-blendbrush-1.5.5.tar.gz) = e527pE2RIB/PcY0RDeOIoVWofAcC3KZYj62Ie23p48M=
|
||||
SHA256 (redeclipse-data-caustics-1.5.5.tar.gz) = kJS/X7oCEd7gkck76Hb/GNggGJdGUyOPm9SwTA2RSxc=
|
||||
SHA256 (redeclipse-data-crosshairs-1.5.5.tar.gz) = 0LXCgXlk0nMMLiMk+nW6zT/6HCjlxT+D8y2kug3rbhc=
|
||||
SHA256 (redeclipse-data-dziq-1.5.5.tar.gz) = BimhCwe1vQwO+wuFyo7e8EcJXSZI2hBlHJwiEYJ6y2w=
|
||||
SHA256 (redeclipse-data-elyvisions-1.5.5.tar.gz) = Kba2mkF1436ZLnHpbgM1TD6hvTad0rDJrvg9QFhf7Ts=
|
||||
SHA256 (redeclipse-data-fonts-1.5.5.tar.gz) = +X1QQQg6u8Cdr4fFu+JnnDt0zdABKBl8S+RGZVKze2k=
|
||||
SHA256 (redeclipse-data-freezurbern-1.5.5.tar.gz) = luP6tP7lax6ieC0qJ1+ZxkOqiNPrOAzMwK4Kgv9vwEw=
|
||||
SHA256 (redeclipse-data-john-1.5.5.tar.gz) = gZ3iEAZDyaVD1zXlg2Ko/8dKPEODUN/2Vu+B6jbaydI=
|
||||
SHA256 (redeclipse-data-jojo-1.5.5.tar.gz) = YXUIHNPG+jDQsxW0Efje3C+rDi1YuwM2xaYuogWirzE=
|
||||
SHA256 (redeclipse-data-jwin-1.5.5.tar.gz) = QGxRpVxPS7KBA4m7NxYhV8MDuD6IkFile5N552Le5Xk=
|
||||
SHA256 (redeclipse-data-luckystrike-1.5.5.tar.gz) = M03X8aUlY69KOwuopz3gRSYqB1zUYgRqytr+BLBiAjk=
|
||||
SHA256 (redeclipse-data-maps-1.5.5.tar.gz) = lMoXjquRuXZWkPRQYAlfcvKraC8zxdOhVSLcWAccopI=
|
||||
SHA256 (redeclipse-data-mayhem-1.5.5.tar.gz) = KgPlG1NrydosE+Cq67Ln9YJFgU/SYSLOUydilZnJuTc=
|
||||
SHA256 (redeclipse-data-mikeplus64-1.5.5.tar.gz) = mgVrqN7OC+4CtjEvOXZ5Q6RZCT6jN9i1Ea3BMbOPDxA=
|
||||
SHA256 (redeclipse-data-misc-1.5.5.tar.gz) = GEy6f33SAauUrgiSUcZU9tHYvS3GbUHzEQ/qZ2HSrh8=
|
||||
SHA256 (redeclipse-data-nieb-1.5.5.tar.gz) = tVlUew6E3V9bQCL+A5ET+9ClbAe78WKtWHsfHY7UC/c=
|
||||
SHA256 (redeclipse-data-nobiax-1.5.5.tar.gz) = Bs61NfMc5Qh5g1svVZBy+gz7EIxOZ7LVF9kIUiJ8dtg=
|
||||
SHA256 (redeclipse-data-particles-1.5.5.tar.gz) = 7aHLo4PQKGXKs5vJvHgC3y1hv6AdHQFK788Nqqa3QHo=
|
||||
SHA256 (redeclipse-data-philipk-1.5.5.tar.gz) = km2rUY5tLC74j+v+gwVD7Gx27dPlhdfrslPDhPvMc9Q=
|
||||
SHA256 (redeclipse-data-projectiles-1.5.5.tar.gz) = auU0gVKMKhFgeMvQiNSwv82yijUjTNoGw38fJanaXBc=
|
||||
SHA256 (redeclipse-data-props-1.5.5.tar.gz) = 3gKH+GZ1CEtb0R6v7EOFwEUCaYxxmm6AvOUTXfgzEbM=
|
||||
SHA256 (redeclipse-data-skyboxes-1.5.5.tar.gz) = LOaGfRCd7syWfM0vQFLmt259WkzJ4gEFRYmClRDtptY=
|
||||
SHA256 (redeclipse-data-snipergoth-1.5.5.tar.gz) = lFZr693dc9bnasdO9st45px2NqhQSEyc3B4w+wnQ7do=
|
||||
SHA256 (redeclipse-data-sounds-1.5.5.tar.gz) = VAjxsSYfbCqI1CIg6splk9nGV46dJaWi/xoy4L6SBw8=
|
||||
SHA256 (redeclipse-data-textures-1.5.5.tar.gz) = 0SppvBdzaqvVju6f/yDz2B4adpuqGKagvzzPnlT3WLE=
|
||||
SHA256 (redeclipse-data-torley-1.5.5.tar.gz) = NO7TWCCA3WIp7b0NHt4LgccmhrZR5WTlwB63iv+k6MI=
|
||||
SHA256 (redeclipse-data-trak-1.5.5.tar.gz) = 2fffs01l05dxsXEu+zq7IpVKu8WEPVrOhwCP0ZX8jHI=
|
||||
SHA256 (redeclipse-data-ulukai-1.5.5.tar.gz) = ZLCyJjr6P8dKVzhx8YVKhFhSftmkauI1bFGL5Do+djY=
|
||||
SHA256 (redeclipse-data-unnamed-1.5.5.tar.gz) = q5nX7oUHlXgc0bUO+OuniDJ4x1gKI9g915XeDa6rNV0=
|
||||
SHA256 (redeclipse-data-vanities-1.5.5.tar.gz) = m4rGanGzxeMjBnUJWs/HUaJUZitr98VKn0TuSkdBQ/A=
|
||||
SHA256 (redeclipse-data-vegetation-1.5.5.tar.gz) = 9rJDniNvJQPYG/lcVg7QuTIVvUbRtEjn/k6YXaGkgUs=
|
||||
SHA256 (redeclipse-data-weapons-1.5.5.tar.gz) = nE9ppR43nfBeQBv1zVMZyAx0upgti2jqm/B4ooPPxNw=
|
||||
SHA256 (redeclipse-data-wicked-1.5.5.tar.gz) = qfVGzXXyHqvi8KK3YYGT4rCMx3P+aokzKNDTEqzwt84=
|
||||
SIZE (redeclipse-1.5.5.tar.gz) = 13830740
|
||||
SIZE (redeclipse-data-acerspyro-1.5.5.tar.gz) = 2772685
|
||||
SIZE (redeclipse-data-actors-1.5.5.tar.gz) = 24771060
|
||||
SIZE (redeclipse-data-appleflap-1.5.5.tar.gz) = 990541
|
||||
SIZE (redeclipse-data-blendbrush-1.5.5.tar.gz) = 1617068
|
||||
SIZE (redeclipse-data-caustics-1.5.5.tar.gz) = 780921
|
||||
SIZE (redeclipse-data-crosshairs-1.5.5.tar.gz) = 481800
|
||||
SIZE (redeclipse-data-dziq-1.5.5.tar.gz) = 4384551
|
||||
SIZE (redeclipse-data-elyvisions-1.5.5.tar.gz) = 36434731
|
||||
SIZE (redeclipse-data-fonts-1.5.5.tar.gz) = 275634
|
||||
SIZE (redeclipse-data-freezurbern-1.5.5.tar.gz) = 9404545
|
||||
SIZE (redeclipse-data-john-1.5.5.tar.gz) = 1188748
|
||||
SIZE (redeclipse-data-jojo-1.5.5.tar.gz) = 37792164
|
||||
SIZE (redeclipse-data-jwin-1.5.5.tar.gz) = 1417739
|
||||
SIZE (redeclipse-data-luckystrike-1.5.5.tar.gz) = 28151694
|
||||
SIZE (redeclipse-data-maps-1.5.5.tar.gz) = 133944066
|
||||
SIZE (redeclipse-data-mayhem-1.5.5.tar.gz) = 21468202
|
||||
SIZE (redeclipse-data-mikeplus64-1.5.5.tar.gz) = 17665384
|
||||
SIZE (redeclipse-data-misc-1.5.5.tar.gz) = 1290682
|
||||
SIZE (redeclipse-data-nieb-1.5.5.tar.gz) = 36720008
|
||||
SIZE (redeclipse-data-nobiax-1.5.5.tar.gz) = 5122459
|
||||
SIZE (redeclipse-data-particles-1.5.5.tar.gz) = 1643748
|
||||
SIZE (redeclipse-data-philipk-1.5.5.tar.gz) = 93466848
|
||||
SIZE (redeclipse-data-projectiles-1.5.5.tar.gz) = 4421468
|
||||
SIZE (redeclipse-data-props-1.5.5.tar.gz) = 2228753
|
||||
SIZE (redeclipse-data-skyboxes-1.5.5.tar.gz) = 10625791
|
||||
SIZE (redeclipse-data-snipergoth-1.5.5.tar.gz) = 17486906
|
||||
SIZE (redeclipse-data-sounds-1.5.5.tar.gz) = 40403376
|
||||
SIZE (redeclipse-data-textures-1.5.5.tar.gz) = 16361650
|
||||
SIZE (redeclipse-data-torley-1.5.5.tar.gz) = 57189715
|
||||
SIZE (redeclipse-data-trak-1.5.5.tar.gz) = 67385500
|
||||
SIZE (redeclipse-data-ulukai-1.5.5.tar.gz) = 8602303
|
||||
SIZE (redeclipse-data-unnamed-1.5.5.tar.gz) = 78727115
|
||||
SIZE (redeclipse-data-vanities-1.5.5.tar.gz) = 7671914
|
||||
SIZE (redeclipse-data-vegetation-1.5.5.tar.gz) = 4904515
|
||||
SIZE (redeclipse-data-weapons-1.5.5.tar.gz) = 44862028
|
||||
SIZE (redeclipse-data-wicked-1.5.5.tar.gz) = 66677195
|
||||
|
||||
@ -1,23 +1,27 @@
|
||||
$OpenBSD: patch-Makefile,v 1.2 2015/06/28 03:47:09 jsg Exp $
|
||||
--- Makefile.orig Wed Jun 17 15:08:34 2015
|
||||
+++ Makefile Sat Jun 20 22:27:54 2015
|
||||
@@ -31,13 +31,13 @@ TOOLSET_PREFIX=x86_64-w64-mingw32-
|
||||
$OpenBSD: patch-Makefile,v 1.3 2016/07/30 15:41:37 jsg Exp $
|
||||
--- Makefile.orig Thu Jun 30 14:34:23 2016
|
||||
+++ Makefile Sun Jul 31 01:16:28 2016
|
||||
@@ -31,8 +31,8 @@ TOOLSET_PREFIX=x86_64-w64-mingw32-
|
||||
else
|
||||
TOOLSET_PREFIX=i686-w64-mingw32-
|
||||
endif
|
||||
-CXX=g++
|
||||
-CC=gcc
|
||||
+CXX?=g++
|
||||
+CC?=gcc
|
||||
endif
|
||||
|
||||
CXX_TEMP:=$(CXX)
|
||||
@@ -40,7 +40,7 @@ CC_TEMP:=$(CC)
|
||||
override CXX=$(TOOLSET_PREFIX)$(CXX_TEMP)
|
||||
override CC=$(TOOLSET_PREFIX)$(CC_TEMP)
|
||||
|
||||
-INCLUDES= -I. -Ishared -Iengine -Igame -Ienet/include
|
||||
+INCLUDES= -I. -Ishared -Iengine -Igame `pkg-config --cflags libenet`
|
||||
|
||||
-INCLUDES= -I. -Ishared -Iengine -Igame -Ienet/include -Isupport
|
||||
+INCLUDES= -I. -Ishared -Iengine -Igame `pkg-config --cflags libenet` -Isupport
|
||||
|
||||
STRIP=
|
||||
@@ -75,13 +75,13 @@ ifneq (,$(findstring linux,$(PLATFORM)))
|
||||
ifeq (,$(findstring -g,$(CXXFLAGS)))
|
||||
@@ -77,13 +77,13 @@ ifneq (,$(findstring linux,$(PLATFORM)))
|
||||
BIN_SUFFIX=_linux
|
||||
else
|
||||
ifneq (,$(findstring bsd,$(PLATFORM)))
|
||||
@ -27,14 +31,14 @@ $OpenBSD: patch-Makefile,v 1.2 2015/06/28 03:47:09 jsg Exp $
|
||||
BIN_SUFFIX=_native
|
||||
endif
|
||||
endif
|
||||
-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
|
||||
-CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
|
||||
+CLIENT_INCLUDES= $(INCLUDES) `sdl-config --cflags`
|
||||
+CLIENT_LIBS= `pkg-config --libs libenet` `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
|
||||
-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl2-config --cflags`
|
||||
-CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL
|
||||
+CLIENT_INCLUDES= $(INCLUDES) `sdl2-config --cflags`
|
||||
+CLIENT_LIBS= `pkg-config --libs libenet` `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL
|
||||
endif
|
||||
ifneq (,$(findstring linux,$(PLATFORM)))
|
||||
CLIENT_LIBS+= -lrt
|
||||
@@ -156,7 +156,7 @@ SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -Iinclude
|
||||
@@ -161,7 +161,7 @@ SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -Iinclude
|
||||
SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINDLL) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
|
||||
else
|
||||
SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
|
||||
@ -43,7 +47,7 @@ $OpenBSD: patch-Makefile,v 1.2 2015/06/28 03:47:09 jsg Exp $
|
||||
endif
|
||||
SERVER_OBJS= \
|
||||
shared/crypto-standalone.o \
|
||||
@@ -170,16 +170,12 @@ SERVER_OBJS= \
|
||||
@@ -176,16 +176,12 @@ SERVER_OBJS= \
|
||||
engine/server-standalone.o \
|
||||
game/server-standalone.o
|
||||
|
||||
@ -60,7 +64,7 @@ $OpenBSD: patch-Makefile,v 1.2 2015/06/28 03:47:09 jsg Exp $
|
||||
|
||||
clean-client:
|
||||
@rm -fv $(CLIENT_PCH) $(CLIENT_OBJS) $(APPCLIENT)$(BIN_SUFFIX)
|
||||
@@ -190,7 +186,7 @@ clean-server:
|
||||
@@ -196,7 +192,7 @@ clean-server:
|
||||
clean-genkey:
|
||||
@rm -fv $(GENKEY_OBJS) genkey$(BIN_SUFFIX)
|
||||
|
||||
@ -69,7 +73,7 @@ $OpenBSD: patch-Makefile,v 1.2 2015/06/28 03:47:09 jsg Exp $
|
||||
|
||||
%.h.gch: %.h
|
||||
$(CXX) $(CXXFLAGS) -x c++-header -o $(subst .h.gch,.tmp.h.gch,$@) $(subst .h.gch,.h,$@)
|
||||
@@ -214,10 +210,10 @@ $(APPSERVER)_windows$(BIN_SUFFIX): $(SERVER_OBJS)
|
||||
@@ -223,10 +219,10 @@ $(APPSERVER)_windows$(BIN_SUFFIX): $(SERVER_OBJS)
|
||||
$(WINDRES) -i $(APPNAME).rc -J rc -o $(APPNAME).res -O coff
|
||||
$(CXX) $(CXXFLAGS) -o $@ $(APPNAME).res $(SERVER_OBJS) $(SERVER_LIBS)
|
||||
|
||||
@ -82,22 +86,22 @@ $OpenBSD: patch-Makefile,v 1.2 2015/06/28 03:47:09 jsg Exp $
|
||||
$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(SERVER_OBJS) $(SERVER_LIBS)
|
||||
|
||||
client: $(APPCLIENT)$(APPMODIFIER)$(BIN_SUFFIX)
|
||||
@@ -256,9 +252,6 @@ endif
|
||||
@@ -275,9 +271,6 @@ endif
|
||||
|
||||
install: install-client install-server
|
||||
install: install-client install-server install-genkey
|
||||
|
||||
-$(LIBENET):
|
||||
- $(MAKE) -C enet
|
||||
-
|
||||
depend:
|
||||
makedepend -Y -I. -Ishared -Iengine -Igame $(subst .o,.cpp,$(CLIENT_OBJS))
|
||||
makedepend -a -o-standalone.o -Y -I. -Ishared -Iengine -Igame -DSTANDALONE $(subst -standalone.o,.cpp,$(SERVER_OBJS))
|
||||
@@ -267,7 +260,7 @@ depend:
|
||||
all: client server
|
||||
makedepend -Y -I. -Ishared -Iengine -Igame -Isupport $(subst .o,.cpp,$(CLIENT_OBJS))
|
||||
makedepend -a -o-standalone.o -Y -I. -Ishared -Iengine -Igame -Isupport -DSTANDALONE $(subst -standalone.o,.cpp,$(SERVER_OBJS))
|
||||
@@ -286,7 +279,7 @@ depend:
|
||||
all: client server genkey
|
||||
|
||||
include system-install.mk
|
||||
-include dist.mk
|
||||
+#include dist.mk
|
||||
include wiki.mk
|
||||
|
||||
engine/engine.h.gch: version.h shared/cube.h.gch
|
||||
engine/engine.h.gch: engine/version.h shared/cube.h.gch
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user