Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated make links #2575

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Updated make links #2575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
aa5cc03
bin download updates
evan-wallin Dec 13, 2020
b60da5c
more more bin download updates
evan-wallin Dec 13, 2020
de4a1e9
Get tmx2lua from hawkthorne
evan-wallin Dec 15, 2020
5ca2149
Add tmx install and fix win32 love link
evan-wallin Dec 16, 2020
11cb533
get love from github
Dec 16, 2020
f3a5cd2
update travis and conf to 0.10.2
Dec 16, 2020
5f6ec96
Linux build love-0.10.2 update
Dec 16, 2020
d75062c
fixing 0.10.2 updates
Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ install:
- sudo apt-get install python-virtualenv lua5.1 -y
- sudo add-apt-repository -y ppa:bartbes/love-stable
- sudo apt-get update -y
- sudo apt-get install -y love
- sudo apt-get install -y love=0.10.2
- mkdir -p $TRAVIS_BUILD_DIR/share/love/
env:
global:
Expand Down
31 changes: 17 additions & 14 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
UNAME := $(shell uname)

ifeq ($(UNAME), Darwin)
TMXTAR = tmx2lua.osx.tar
OPTION = osx/tmx2lua
LOVE = bin/love.app/Contents/MacOS/love
else
TMXTAR = tmx2lua.linux.tar
OPTION = linux/tmx2lua
LOVE = /usr/bin/love
endif

Expand Down Expand Up @@ -35,23 +35,26 @@ src/maps/%.lua: src/maps/%.tmx bin/tmx2lua

bin/tmx2lua:
mkdir -p bin
$(wget) http://hawkthorne.github.com/tmx2lua/downloads/$(TMXTAR)
tar -xvf $(TMXTAR)
rm -f $(TMXTAR)
mv tmx2lua bin
$(wget) https://github.com/hawkthorne/tmx2lua/archive/master.zip
unzip master.zip
rm -rf master.zip
make -C tmx2lua-master install
make -C tmx2lua-master
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
make -C tmx2lua-master
make -C tmx2lua-master install
make -C tmx2lua-master

When remaking the file, make sure that go-tmx/tmx is installed.

mv tmx2lua-master/$(OPTION) bin
rm -rf tmx2lua-master

bin/love.app/Contents/MacOS/love:
mkdir -p bin
$(wget) https://bitbucket.org/rude/love/downloads/love-0.10.1-macosx-x64.zip
unzip -q love-0.10.1-macosx-x64.zip
rm -f love-0.10.1-macosx-x64.zip
$(wget) https://github.com/love2d/love/releases/download/0.10.2/love-0.10.2-macosx-x64.zip
unzip -q love-0.10.2-macosx-x64.zip
rm -f love-0.10.2-macosx-x64.zip
mv love.app bin
cp osx/Info.plist bin/love.app/Contents

/usr/bin/love:
sudo add-apt-repository -y ppa:bartbes/love-stable
sudo apt-get update -y -f
sudo apt-get install -y love
sudo apt-get install -y love=0.10.2

######################################################
# THE REST OF THESE TARGETS ARE FOR RELEASE AUTOMATION
Expand All @@ -73,10 +76,10 @@ src/positions/%.lua: psds/positions/%.png
overlay2lua src/positions/config.json $<

win32/love.exe:
$(wget) https://bitbucket.org/rude/love/downloads/love-0.10.1-win32.zip
unzip -q love-0.10.1-win32.zip
mv love-0.10.1-win32 win32
rm -f love-0.10.1-win32.zip
$(wget) https://github.com/love2d/love/releases/download/0.10.2/love-0.10.2-win32.zip
unzip -q love-0.10.2-win32.zip
mv love-0.10.2-win32 win32
rm -f love-0.10.2-win32.zip
rm win32/changes.txt win32/game.ico win32/license.txt win32/love.ico win32/readme.txt

win32/hawkthorne.exe: build/hawkthorne.love win32/love.exe
Expand Down
14 changes: 7 additions & 7 deletions make.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ if($check -eq $false){
}

$webclient = New-Object System.Net.WebClient
$lovedir = "bin\love-0.10.1-win32\"
$check = Test-Path "bin\love-0.10.1-win32\love.exe"
$lovedir = "bin\love-0.10.2-win32\"
$check = Test-Path "bin\love-0.10.2-win32\love.exe"

#add love to the path if necessary
$foundlove = $env:Path.Contains($lovedir)
Expand All @@ -27,13 +27,13 @@ if($foundlove -eq $false){

if($check -eq $false){

$filename = (Get-Location).Path + "\bin\love-0.10.1-win32.zip"
$filename = (Get-Location).Path + "\bin\love-0.10.2-win32.zip"

$check = Test-Path $filename

if($check -eq $false){
Write-Host "Downloading love2d..."
$url = "https://bitbucket.org/rude/love/downloads/love-0.10.1-win32.zip"
$url = "https://github.com/love2d/love/releases/download/0.10.2/love-0.10.2-win32.zip"
$webclient.DownloadFile($url,$filename)
}

Expand Down Expand Up @@ -83,11 +83,11 @@ foreach($fileName in $fileEntries)
if($args[0] -eq "run"){
Write-Host "Running Journey to the Center of Hawkthorne..."
if($args.Length -ne 1){
.\bin\love-0.10.1-win32\love.exe src $args[1..($args.Length-1)]
.\bin\love-0.10.2-win32\love.exe src $args[1..($args.Length-1)]
}else{
.\bin\love-0.10.1-win32\love.exe src
.\bin\love-0.10.2-win32\love.exe src
}
}elseif($args[0] -eq "test"){
Write-Host "Testing Journey to the Center of Hawkthorne..."
.\bin\love-0.10.1-win32\love.exe src --test --console
.\bin\love-0.10.2-win32\love.exe src --test --console
}
2 changes: 1 addition & 1 deletion src/conf.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ function love.conf(t)
t.title = "Journey to the Center of Hawkthorne v0.0.0"
t.url = "http://projecthawkthorne.com"
t.author = "https://github.com/hawkthorne?tab=members"
t.version = "0.10.0"
t.version = "0.10.2"
t.identity = "hawkthorne"
t.window.width = 1056
t.window.height = 672
Expand Down
2 changes: 1 addition & 1 deletion templates/conf.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ function love.conf(t)
t.title = "Journey to the Center of Hawkthorne v{{ version }}"
t.url = "http://projecthawkthorne.com"
t.author = "https://github.com/hawkthorne?tab=members"
t.version = "0.10.0"
t.version = "0.10.2"
t.identity = "hawkthorne_release"
t.window.width = 1056
t.window.height = 672
Expand Down