merge brcaswell/Maintenance to ENSL/develop

ENSL / NS

Natural Selection mod for Half-life

http://www.unknownworlds.com/ns

GNU General Public License v3.0

43 stars 12 forks source link

merge brcaswell/Maintenance to ENSL/develop #39

Closed brcaswell closed 5 years ago

brcaswell commented 5 years ago

addresses CMake and updates gitignore (removes files that are to be ignored)

jirikivaari commented 5 years ago

The CI build fails.

opengl.cpp:19:19: fatal error: GL/gl.h: No such file or directory 688compilation terminated. 689Makefile:39: recipe for target 'opengl.o' failed 690make[1]: [opengl.o] Error 1 691make[1]: Leaving directory '/home/travis/build/ENSL/NS/main/source/particles' 692Makefile:145: recipe for target 'particles' failed 693make: [particles] Error 2 694The command "cd main/source/linux && make" exited with 2.

pierow commented 5 years ago

I don't think we want the makefiles being ignored: https://github.com/brcaswell/NS/blob/057acfdef89bfbd48317aec78999bba6fde72d79/.gitignore#L256

brcaswell commented 5 years ago

The CI build fails.

opengl.cpp:19:19: fatal error: GL/gl.h: No such file or directory 688compilation terminated. 689Makefile:39: recipe for target 'opengl.o' failed 690make[1]: [opengl.o] Error 1 691make[1]: Leaving directory '/home/travis/build/ENSL/NS/main/source/particles' 692Makefile:145: recipe for target 'particles' failed 693make: [particles] Error 2 694The command "cd main/source/linux && make" exited with 2.

Yeah, I should have done a dry-run deletion to see what was impacted by these. git rm --cached -n *Makefile* in bash showed that it was too impactful.

brcaswell commented 5 years ago

Closing until I can figure how to test this and resolve