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
Clownacy
03755933ba
Added Travis badge to readme
...
These were already in the portable and enhanced branches, but not
here
2020-01-23 13:59:27 +00:00
Clownacy
7a30be8a4a
Cleanup, support WINDRES as an environment variable
...
Also reenabled the Discord stuff even though it worked without those
lines(???)
2020-01-23 13:56:25 +00:00
Clownacy
c731f7077f
Fix WINDRES in the Travis script
2020-01-23 13:51:38 +00:00
Clownacy
2f206d1ef8
Add a Travis file
...
Not really sure how to test this beyond just spamming commits to the
repo until it works, so bear with me
2020-01-23 13:43:38 +00:00
Clownacy
b274c3af6a
Fix window icon in Windows builds
2020-01-23 12:29:22 +00:00
Clownacy
78b41a5ced
Merge branch 'accurate' into portable
2020-01-23 01:50:42 +00:00
Clownacy
0237844e14
Actually, this fix doesn't seem right
2020-01-23 01:50:03 +00:00
Clownacy
e8edc42d07
Merge branch 'accurate' into portable
2020-01-23 01:37:03 +00:00
Clownacy
4091d152ee
Minor style tweak
2020-01-23 01:36:19 +00:00
Clownacy
a65c4bc1e3
Added bugfix to Organya
2020-01-23 01:34:55 +00:00
Clownacy
1fe73f9aab
Explicitly compare pointers in Font.cpp to NULL
2020-01-23 01:05:29 +00:00
Clownacy
413fe560e4
Add LTO toggle to DoConfig CMakeLists.txt
2020-01-23 01:00:07 +00:00
Clownacy
c45e888b74
Improve CMake style consistency
2020-01-23 00:59:27 +00:00
Clownacy
d2a514161b
Remove two dummied-out dependencies from Travis
...
One isn't used anymore, and the other isn't relevant to this branch
2020-01-23 00:13:56 +00:00
Clownacy
76a71d703b
Merge branch 'accurate' into portable
2020-01-23 00:04:42 +00:00
Clownacy
ede9fa213d
Fix compilation with FIX_BUGS enabled
2020-01-23 00:03:54 +00:00
Clownacy
8798a7cc19
Add the RGB macro to the windows.h wrapper
2020-01-22 23:53:14 +00:00
Clownacy
2f4eb464a5
Merge branch 'accurate' into portable
2020-01-22 23:51:42 +00:00
Clownacy
f687c5f68b
Remove the RGB macro
...
This is a leftover part of the window.h emulator in that got moved to
the portable branch
2020-01-22 23:50:27 +00:00
Clownacy
2c3a4a3620
Fix Makefile LTO
...
Now applies to CFLAGS as well
2020-01-22 23:39:52 +00:00
Clownacy
db9350bdb9
Add LTO option to CMakeLists.txt
2020-01-22 23:39:05 +00:00
Clownacy
3263668156
Merge branch 'accurate' into portable
2020-01-22 23:35:49 +00:00
Clownacy
867af9f090
Add option to the Makefile to enable LTO
2020-01-22 23:34:12 +00:00
Clownacy
4ebfe064ff
Fix compilation
2020-01-22 23:33:59 +00:00
Clownacy
87b296c513
Converted SDLSurface renderer
2020-01-22 22:33:34 +00:00
Clownacy
f6f3c26a3b
Converted SDLTexture renderer
2020-01-22 22:31:19 +00:00
Clownacy
48b7a878ba
Convert software renderer
2020-01-22 22:24:23 +00:00
Clownacy
6dac8254e2
Begin merge of Backend_Init/Backend_CreateWindow
...
OpenGL3+OpenGLES2 backend done so far
2020-01-22 22:19:55 +00:00
Clownacy
3baba6a727
Make FlushVertexBuffer bail when buffer is empty
2020-01-22 21:56:11 +00:00
Clownacy
88c30442c5
Force SDL2's render-batching
...
SDL2 will implicitly disable batching if we force a specific
rendering driver (apparently the user setting SDL_RENDER_DRIVER
counts too) for backwards-compatibility with older programs that use
their own rendering side-by-side with SDL2's. We don't do that,
though, so this commit forces SDL2 to use batching if it's available
(2.0.10 and onwards).
2020-01-21 23:39:49 +00:00
Clownacy
2fec50ff4e
Use constants for attribute locations
2020-01-21 20:16:38 +00:00
