vcpkg/ports/freeglut/fix-debug-macro.patch
Tim Autry 7bfd3e4b31
[freeglut] fix debug macro patch ()
* [freeglut] fix linking release dll to debug lib

This patch:
1. Increments version by -1 in the CONTROL file
2. Adds execution of fix-debug-macro.patch file in portfile.cmake
3. Add the fix-debug-macro.patch to the port directory

* [freeglut] update version to -1 

Update CONTROL file to reflect version 3.2.1-1 adding fix-debug-macro.patch

* [freeglut] update portfile.cmake

Update portfile.cmake to execute new fix-debug-macro.patch
Reference: https://github.com/microsoft/vcpkg/issues/8315
This patch updates:
1.  the ./include/GL/freeglut_std.h
     - line 73 and 91
       - from ifdef NDEBUG
       - to if defined(NDEBUG) || !defined(_DEBUG)
2. the ./src/blackberry/fg_main_blackberry.c
    - line 34
       - from ifdef NDEBUG
       - to if defined(NDEBUG) || !defined(_DEBUG)

* Update portfile.cmake

* Update ports/freeglut/portfile.cmake

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-05-26 22:02:55 -07:00

36 lines
1.2 KiB
Diff

diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h
index a658c7c..a5efb3b 100644
--- a/include/GL/freeglut_std.h
+++ b/include/GL/freeglut_std.h
@@ -70,7 +70,7 @@
/* Link with Win32 static freeglut lib */
# if FREEGLUT_LIB_PRAGMAS
-# ifdef NDEBUG
+# if defined(NDEBUG) || !defined(_DEBUG)
# pragma comment (lib, "freeglut_static.lib")
# else
# pragma comment (lib, "freeglut_staticd.lib")
@@ -88,7 +88,7 @@
/* Link with Win32 shared freeglut lib */
# if FREEGLUT_LIB_PRAGMAS
-# ifdef NDEBUG
+# if defined(NDEBUG) || !defined(_DEBUG)
# pragma comment (lib, "freeglut.lib")
# else
# pragma comment (lib, "freeglutd.lib")
diff --git a/src/blackberry/fg_main_blackberry.c b/src/blackberry/fg_main_blackberry.c
index a1b9cbb..a20c53d 100644
--- a/src/blackberry/fg_main_blackberry.c
+++ b/src/blackberry/fg_main_blackberry.c
@@ -31,7 +31,7 @@
#include "fg_internal.h"
#include "egl/fg_window_egl.h"
-#ifdef NDEBUG
+#if defined(NDEBUG) || !defined(_DEBUG)
#define LOGI(...)
#endif