OpenFusion

Commit Graph

Author	SHA1	Message	Date
dongresource	efda6673b5	Print server version when starting up. Also added -ldl to fix cmake compilation on Unix systems.	2020-09-16 20:12:56 +02:00
darkredtitan	5cf7225f52	Tried to manually merge kamilprzyb and main repo's code (#45 ) * Merge kamilprzyb and main repo's code * Update Makefile by FunnHornhoover * Update Makefile by FinnHornhoover * Add flag to Makefile by FinnHornhoover * Remove extra line from makefile * Remove lbcrypt from Makefile * Fix flag to Makefile by FinnHornhoover * Reimplement potential fix for tutorial blackscreen by Dongresources * Update CMakeLists.txt * Update CMakeLists.txt * Reinsert Jade's changes * Cosmetic Changes to Databases .h & .cpp * Remove CMakeSettings.json * Update Makefile by Finn Hornhoover * More cosmetic changes to Databases.cpp * More cosmetic changes to Databases.cpp * Remove unnecessary line (CMakeSettings.json) * Fix CNLoginServer.cpp * More cosmetic Changes to Database.hpp, edit Database.cpp to use JSON library onstead of json11 library, and delete json11 library files * Delete json11 library files * Delete JSON library to reupload * Reupload JSON library from main repo * Reupload JSON library from main repo * Fix syntax error * Fix Makefile * Remove commented line of code to be like master Co-authored-by: CPunch <sethtstubbs@gmail.com>	2020-08-28 13:02:03 -05:00
dongresource	c5dacb4958	Removed CRs from .gitignore and an outdated comment in config.ini.	2020-08-25 00:11:54 +02:00
CakeLancelot	0a8e96ebc4	Update .gitignore for Clion	2020-08-23 12:58:08 -05:00
Raymonf	da11220762	Allow opening CMakeLists as a CMake project in VS Added another check just in case someone wants to do this for some reason. It's bad. You shouldn't do it.	2020-08-20 18:44:30 -04:00
Raymonf	c549192f59	CMake build support (#8 ) * CMake build support * Make things nice for VS users Co-authored-by: Raymonf <Raymonf@users.noreply.github.com>	2020-08-20 15:59:54 -04:00
dongresource	fa5f194cc7	Standardized Makefile. (#7 ) * Standardized Makefile. * Incremental compilation * C++ compilers are called CXX * Removed excessive comments for well-understood things * Added clean target * Proper .PHONY usage * Updated .gitignore for object files (+ ctags, and vim temp files) * Add mkdir -p bin.	2020-08-20 12:03:15 -05:00
CPunch	9d366e3720	inital commit	2020-08-18 15:42:30 -05:00

8 Commits