Skip to content

Commit 36a8f4a

Browse files
illwieckzslipher
authored andcommitted
cmake: really disable GLU with GLEW
1 parent c0e3904 commit 36a8f4a

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -829,6 +829,7 @@ if (BUILD_CLIENT)
829829
find_package(GLEW REQUIRED)
830830
include_directories(${GLEW_INCLUDE_DIR})
831831
set(LIBS_CLIENT ${LIBS_CLIENT} ${GLEW_LIBRARIES})
832+
add_definitions(-DGLEW_NO_GLU)
832833

833834
set(backup_find_framework ${CMAKE_FIND_FRAMEWORK})
834835
set(CMAKE_FIND_FRAMEWORK NEVER) # Mac's system OpenAL doesn't have efx.h

src/engine/renderer/GLMemory.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3838

3939
#include "common/Common.h"
4040

41-
#ifndef GLEW_NO_GLU
42-
#define GLEW_NO_GLU
43-
#endif
4441
#include <GL/glew.h>
4542

4643
#include "BufferBind.h"

src/engine/renderer/tr_local.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ 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
28-
#define GLEW_NO_GLU
29-
#endif
3027
#include <GL/glew.h>
3128

3229
#include "common/FileSystem.h"

0 commit comments

Comments
 (0)