Enable console logging if MONO or LOGGER is defined #159
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closed
jcoby
force-pushed
the
enable-console-logging
branch
from
67ed7dc to
34afd85
Compare
Re-enable console logging on linux and mac builds with the -DMONO option. Rename overloaded Debug_ConsolePrintf function to Debug_ConsolePrintfAt to fix macro expansion. Adds -DLOGGER alias for -DMONO. Implements DescentDevelopers#157
jcoby
force-pushed
the
enable-console-logging
branch
from
34afd85 to
9753f83
Compare
Lgt2x
reviewed
Apr 23, 2024
CMakeLists.txt
Outdated
| set(PLATFORM_INCLUDES "lib/linux" ${SDL_INCLUDE_DIR}) | ||
| endif() | ||
|
|
||
| if(APPLE) | ||
| message("Building for MAC OSX") | ||
| add_definitions(-D_DEBUG -D__LINUX__ -DLINUX -D_MAX_PATH=260 -D_MAX_FNAME=256 -D_REENRANT -DMACOSX=1 -D_USE_OGL_ACTIVE_TEXTURES) | ||
| add_definitions(-D_DEBUG -D__LINUX__ -DLINUX -D_MAX_PATH=260 -D_MAX_FNAME=256 -D_REENRANT -DMACOSX=1 -D_USE_OGL_ACTIVE_TEXTURES -DLOGGER) |
There was a problem hiding this comment.
we want this definition conditionally, if the user specified the CMake Option LOGGER
There was a problem hiding this comment.
Added in latest commit
lib/mono.h
Outdated
| @@ -66,12 +66,12 @@ | |||
| #include "debug.h" | |||
| void nw_InitTCPLogging(char *ip, unsigned short port); | |||
| void nw_TCPPrintf(int n, char *format, ...); | |||
| #if (!defined(RELEASE)) && defined(MONO) | |||
| #if (!defined(RELEASE)) && (defined(MONO) || defined(LOGGER)) | |||
There was a problem hiding this comment.
I don't think we need to keep both, LOGGER is enough
There was a problem hiding this comment.
I wanted to keep both so we could keep the MONO code for historical reasons if we add a logging library. But it's easy enough to resurrect MONO later.
* Adds CMake Option * Adds LOGGER to the README * Removes MONO define in favor of LOGGER
|
Tested, works great. Thanks! |
Closed
JeodC
pushed a commit
that referenced
this pull request
Apr 28, 2024
Enable console logging if MONO or LOGGER is defined
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Re-enable console logging on linux and mac builds with the -DMONO option.
Rename overloaded Debug_ConsolePrintf function to
Debug_ConsolePrintfAt to fix macro expansion.
Adds -DLOGGER alias for -DMONO.
Implements #157