Skip to content

Commit 74aca10

Browse files
committed
Fix GLEW->GLU dependency regression
Add the GLEW_NO_GLU define everywhere needed to prevent the unwanted header dependency.
1 parent 562a91d commit 74aca10

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

src/engine/renderer/GLMemory.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3737
#define GLMEMORY_H
3838

3939
#include "common/Common.h"
40-
#include "GL/glew.h"
40+
41+
#ifndef GLEW_NO_GLU
42+
#define GLEW_NO_GLU
43+
#endif
44+
#include <GL/glew.h>
45+
4146
#include "tr_local.h"
4247
#include "BufferBind.h"
4348

src/engine/renderer/tr_local.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2424
#ifndef TR_LOCAL_H
2525
#define TR_LOCAL_H
2626

27+
#ifndef GLEW_NO_GLU
2728
#define GLEW_NO_GLU
29+
#endif
2830
#include <GL/glew.h>
2931

3032
#include "common/FileSystem.h"

0 commit comments

Comments
 (0)