The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[freeglut] fix debug macro patch (#11527)

Browse Source 
* [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>
This commit is contained in:
Tim Autry 2020-05-27 01:02:55 -04:00 committed by GitHub
parent ec4846cbf5
commit 7bfd3e4b31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/freeglut/CONTROL
View File

@ -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.

35
ports/freeglut/fix-debug-macro.patch Normal file
View File

@ -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

1
ports/freeglut/portfile.cmake
View File

@ -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)