Commit graph

1428 commits

Author SHA1 Message Date
Clownacy
6408303c53
Merge pull request #71 from GabrielRavier/removeNonExistentNameCollisions
Remove undefs in WindowsWrapper
2019-11-04 19:05:56 +00:00
Gabriel Ravier
adc4f99c5a Remove the undefs in WindowsWrapper, as these have no purpose here (no collisions with accurate)
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-04 15:07:20 +01:00
Gabriel Ravier
159bc5d869 Documentation : Make operator priority clearer)
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-04 11:42:34 +01:00
Clownacy
319e416592 Comment-out some unneeded dependencies 2019-11-02 21:20:24 +00:00
Clownacy
85f8d24789 ALL_WARNINGS -> WARNINGS_ALL in .travis.yml 2019-11-02 21:11:54 +00:00
Clownacy
a1ec78211f Added Travis CI badge thingy 2019-11-02 21:03:58 +00:00
Clownacy
84b0cc0e0c
Merge pull request #68 from GabrielRavier/travisCIv2
Add Travis-CI integration
2019-11-02 20:21:16 +00:00
Clownacy
1d005fcb8b
Merge branch 'portable' into travisCIv2 2019-11-02 20:20:17 +00:00
Clownacy
2cc6d1d758 Update warning option names in Makefile 2019-11-02 20:17:21 +00:00
Gabriel Ravier
8c6f1381f0 Add Discord supoprt
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 19:20:28 +01:00
Gabriel Ravier
d3a1e74fac Travis-CI : Attempt to remove manual building from source of SDL2
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 18:20:47 +01:00
Gabriel Ravier
87c8ae2428 Travis-CI : Fixed fltk package name
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 16:44:13 +01:00
Gabriel Ravier
7dc506a92e Travis-CI : Added dev packages which might just fix the build
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 16:40:38 +01:00
Clownacy
9b55660c05
Merge pull request #67 from GabrielRavier/fixMakefile
Actually properly fix the Makefile
2019-11-01 14:55:59 +00:00
Gabriel Ravier
2706480645 Actually properly fix the Makefile
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 15:53:23 +01:00
Gabriel Ravier
f015ebec79 Add parenthesis at end of comment
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 15:40:13 +01:00
Gabriel Ravier
6136911976 Try to fix Makefile by using spaces instead of tabs
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 15:28:05 +01:00
Gabriel Ravier
33d734cb17 Use $(warning message) instead of e@cho
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 15:07:29 +01:00
Gabriel Ravier
d5099a094b Attempt to fix Travis-CI build
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 14:21:39 +01:00
Gabriel Ravier
bc448d0de6 Remove extraneous comma in Makefile
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 13:59:31 +01:00
Gabriel Ravier
d0e59844e4 Attempt to make Travis-CI work
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 13:46:17 +01:00
Gabriel Ravier
d8dc70c2fd Merge branch 'travisCIv2' of https://github.com/GabrielRavier/Cave-Story-Engine-2 into travisCIv2 2019-11-01 13:34:18 +01:00
Gabriel Ravier
7fb44800dd Attempt to fix .travis.yml
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 13:34:00 +01:00
Gabriel Ravier
0fa7da8324 Fixup package download and use clang 9
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 13:34:00 +01:00
Gabriel Ravier
67f5fb6a4a Made it so clang should work
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 13:34:00 +01:00
Gabriel Ravier
1d9f16af3a Correct tabs to spaces
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 13:34:00 +01:00
Gabriel Ravier
0f126a7795 Added some more .travis.yml support
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 13:34:00 +01:00
Gabriel Ravier
40ba60cb8e Started basic .travis.yml setup 2019-11-01 13:34:00 +01:00
Gabriel Ravier
11d1097af7 Attempt to fix .travis.yml
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 13:33:33 +01:00
Clownacy
b4bde54118
Merge pull request #66 from GabrielRavier/fixMakefile
Fix Makefile
2019-11-01 12:32:25 +00:00
Gabriel Ravier
dcede9c931 Fixup package download and use clang 9
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 13:29:08 +01:00
Gabriel Ravier
2ced08fe70 Fix Makefile by adding missing ")" in conditional
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 13:22:00 +01:00
Gabriel Ravier
65502fd809 Fix Makefile
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 13:20:46 +01:00
Gabriel Ravier
d013418ee2 Made it so clang should work
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 13:12:34 +01:00
Gabriel Ravier
7401ae6643 Correct tabs to spaces
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 13:03:37 +01:00
Gabriel Ravier
555b2e4ad0 Added some more .travis.yml support
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 12:53:48 +01:00
Gabriel Ravier
5c4c07d815 Started basic .travis.yml setup 2019-10-31 21:05:06 +01:00
Clownacy
8c8ddd496d Adjust merged commits to suit this branch 2019-10-29 19:04:37 +00:00
Clownacy
18add3466c Merge branch 'accurate' into portable 2019-10-29 19:02:02 +00:00
Clownacy
a25998f113 Add actual dependencies to the .rc file 2019-10-29 18:55:15 +00:00
Clownacy
7f2499243c Add a 'compiling resources' message to Makefile 2019-10-29 18:43:52 +00:00
Clownacy
01c5fb3a37 Shut up another warning 2019-10-29 12:25:03 +00:00
Clownacy
394d5658a4 Merge branch 'accurate' into portable 2019-10-29 12:21:02 +00:00
Clownacy
f596f89736 Shut up more Clang warnings 2019-10-29 12:20:48 +00:00
Clownacy
011b79a051 Shut up some more Clang warnings 2019-10-29 12:20:05 +00:00
Clownacy
85890ef1e6 Shut up some Clang warnings 2019-10-29 12:14:48 +00:00
Clownacy
ba1361abd5 Merge branch 'accurate' into portable 2019-10-29 12:11:35 +00:00
Clownacy
567330cc5b Remove some trailing commas
According to Clang, they're not valid C++98
2019-10-29 12:11:07 +00:00
Clownacy
b14e0939a9 Shut up some Clang warnings in DoConfig 2019-10-29 12:08:47 +00:00
Clownacy
6b98bffba1 Remove mutex_name
It's unused outside of the accurate branch. Maybe someday I'll port
the mutex behaviour.
2019-10-29 12:01:49 +00:00