diff options
| author | Tim Autry <tim.autry@outlook.com> | 2020-05-27 01:02:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-26 22:02:55 -0700 |
| commit | 7bfd3e4b317e95ae0cf301c051d65b9c027ffdd9 (patch) | |
| tree | bd5ae0ba5b8bc70e1ad43bbe67248b9cea120c1c | |
| parent | ec4846cbf54956f11698115ade55ca82d67e0e4e (diff) | |
| download | vcpkg-7bfd3e4b317e95ae0cf301c051d65b9c027ffdd9.tar.gz vcpkg-7bfd3e4b317e95ae0cf301c051d65b9c027ffdd9.zip | |
[freeglut] fix debug macro patch (#11527)
* [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>
| -rw-r--r-- | ports/freeglut/CONTROL | 2 | ||||
| -rw-r--r-- | ports/freeglut/fix-debug-macro.patch | 35 | ||||
| -rw-r--r-- | ports/freeglut/portfile.cmake | 1 |
3 files changed, 37 insertions, 1 deletions
diff --git a/ports/freeglut/CONTROL b/ports/freeglut/CONTROL index acda2181e..19de72cc5 100644 --- a/ports/freeglut/CONTROL +++ b/ports/freeglut/CONTROL @@ -1,4 +1,4 @@ Source: freeglut -Version: 3.2.1 +Version: 3.2.1-1 Homepage: https://sourceforge.net/projects/freeglut/ Description: Open source implementation of GLUT with source and binary backwards compatibility. diff --git a/ports/freeglut/fix-debug-macro.patch b/ports/freeglut/fix-debug-macro.patch new file mode 100644 index 000000000..69f9e82bc --- /dev/null +++ b/ports/freeglut/fix-debug-macro.patch @@ -0,0 +1,35 @@ +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 + diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake index 8b619c2b4..f5eca140e 100644 --- a/ports/freeglut/portfile.cmake +++ b/ports/freeglut/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_extract_source_archive_ex( use_targets_to_export_x11_dependency.patch macOS_Xquartz.patch gcc10.patch + fix-debug-macro.patch ) if(NOT VCPKG_TARGET_IS_WINDOWS) |