Clownacy
26475dacdf
Merge branch 'accurate' into portable
2020-01-24 13:56:12 +00:00
Clownacy
917d69fc4a
Move the data folder back to the game folder
...
The whole 'copy data folder from assets folder to the game folder
when Makefile is ran' thing just made modding annoying.
2020-01-24 13:44:57 +00:00
Clownacy
7aedf1c8a7
Merge branch 'accurate' into portable
2020-01-23 22:08:38 +00:00
Clownacy
53f7c02f5f
Fix typo in Travis file
...
I hate learning new languages...
2020-01-23 22:08:01 +00:00
Clownacy
a9f6bb6459
Merge branch 'accurate' into portable
2020-01-23 22:04:29 +00:00
Clownacy
a3bd721df2
Clean-up Travis file
2020-01-23 22:01:30 +00:00
Clownacy
d8dde5f9d2
Fix the Travis file
2020-01-23 21:00:59 +00:00
Clownacy
fc874f063e
Travis: Split CMake and Make
2020-01-23 20:54:33 +00:00
Clownacy
6008550295
Alright, screw this, no Windows support
...
Getting real sick of waiting 10 minutes for MSYS2 to reinstall itself
just so Make can fail with no error message
2020-01-23 20:17:44 +00:00
Clownacy
f84289a190
arg fix dumb type
...
I really really really really really really should have done these
commit on a branch, and just squashed them together before merging
them back to the regular branch.
2020-01-23 20:02:30 +00:00
Clownacy
f1c59e466d
I hate this so much
...
Some console output would be nice, but Travis's Windows support is
trash and MSYS2 isn't treated as standard at all
2020-01-23 19:51:59 +00:00
Clownacy
52e2b1da34
...
2020-01-23 19:40:23 +00:00
Clownacy
01b218ef4d
...
2020-01-23 19:27:30 +00:00
Clownacy
88169689af
I hate this so much
2020-01-23 19:16:13 +00:00
Clownacy
209f9dfbe0
Try something else
2020-01-23 18:58:35 +00:00
Clownacy
5e9ff515fa
Let's see if Linux works instead
2020-01-23 18:53:51 +00:00
Clownacy
5e0f44b792
Ugh...
2020-01-23 18:44:23 +00:00
Clownacy
628fd6a739
Try to get it working some more
2020-01-23 18:34:32 +00:00
Clownacy
9bf0003544
Try to fix the Travis build
2020-01-23 18:04:27 +00:00
Clownacy
4acdcb90f4
Disable non-Windows builds so we can test it
2020-01-23 17:51:27 +00:00
Clownacy
ede984056a
Merge branch 'accurate' into portable
2020-01-23 17:51:19 +00:00
Clownacy
8905a2ee49
Try to get ccache working again
2020-01-23 17:27:44 +00:00
Clownacy
0090c9a226
And again
2020-01-23 17:08:39 +00:00
Clownacy
d24006c966
Try to get environment variables right
2020-01-23 17:07:41 +00:00
Clownacy
7f88a86916
Travis = >:(
2020-01-23 17:05:25 +00:00
Clownacy
2a74ab6d27
Place your bets
...
Will this random change fix it?
2020-01-23 17:02:14 +00:00
Clownacy
1b64bb71b7
Life is pain
2020-01-23 17:00:12 +00:00
Clownacy
e504f07650
...Try again
2020-01-23 16:59:20 +00:00
Clownacy
91f71d4030
Try to split 32-bit/64-bit builds
2020-01-23 16:57:58 +00:00
Clownacy
a20b906257
Fix some stupid error that was caused by...
...
...literally nothing
2020-01-23 16:38:51 +00:00
Clownacy
d4214e6dc9
???
2020-01-23 16:27:45 +00:00
Clownacy
057e762279
Screw you Travis
2020-01-23 16:25:31 +00:00
Clownacy
871e443f90
swearing
2020-01-23 16:20:09 +00:00
Clownacy
31fa8f7352
Say it with me: "this is annoying"
2020-01-23 16:19:07 +00:00
Clownacy
ae016bbcf6
...And again
2020-01-23 16:15:24 +00:00
Clownacy
e45bac46db
Clearly I don't understand Bash syntax
2020-01-23 16:14:51 +00:00
Clownacy
cd415916ac
Travis: Try to fix WINDRES and 32-bit builds
2020-01-23 16:12:33 +00:00
Clownacy
5ac0f5d160
Install regular make?
2020-01-23 15:55:36 +00:00
Clownacy
c793e302db
Dummy out 32-bit for now
...
Travis's example Windows script is 64-bit-only. I'll hack it up in a
bit.
2020-01-23 15:38:13 +00:00
Clownacy
05e0b49c29
Work already dammit
2020-01-23 15:28:41 +00:00
Clownacy
cbe6262e74
Try to fix whatever syntax error Travis isn't...
...
...telling me about.
Also this 50 letter limit is stupid
2020-01-23 15:26:25 +00:00
Clownacy
d8d08bf553
Try to get a Travis native Windows build working
2020-01-23 15:21:14 +00:00
Clownacy
d33e007d0f
Apparently Travis's 'sudo' is deprecated now?
2020-01-23 15:03:04 +00:00
Clownacy
6549342473
Don't attempt Windows cross-compilation
...
Well that was disappointing. Ubuntu doesn't seem to have packages
for MinGW-compiled libs, so I can't satisfy the build dependencies.
I might try just doing native Windows compilation, since I'd have
MSYS2 at my disposal.
2020-01-23 14:58:25 +00:00
Clownacy
696498a98f
Fix Travis file?
2020-01-23 14:47:17 +00:00
Clownacy
441fe2faed
Merge branch 'accurate' into portable
2020-01-23 14:39:55 +00:00
Clownacy
5fd0b5839b
More Travis cleanup
2020-01-23 14:32:29 +00:00
Clownacy
35ac2aead8
Er, don't break the Travis file
2020-01-23 14:25:30 +00:00
Clownacy
55090dc7cc
Attempt to build release and debug binaries
...
Also build static binaries, since that's what's intended for the
Windows builds
2020-01-23 14:23:02 +00:00
Clownacy
29eecc26c9
Build both 32-bit and 64-bit binaries in Travis
2020-01-23 14:17:54 +00:00
