mirror of
				https://github.com/edubart/otclient.git
				synced 2025-11-04 04:36:23 +01:00 
			
		
		
		
	make work on win32 again using GLEW
This commit is contained in:
		@@ -20,11 +20,10 @@ FIND_PACKAGE(Boost COMPONENTS system REQUIRED)
 | 
			
		||||
IF(USE_OPENGL_ES2)
 | 
			
		||||
    FIND_PACKAGE(OpenGLES2 REQUIRED)
 | 
			
		||||
    FIND_PACKAGE(EGL REQUIRED)
 | 
			
		||||
    SET(OPENGL_INCLUDE_DIR ${OPENGLES_INCLUDE_DIR} ${EGL_INCLUDE_DIR})
 | 
			
		||||
    SET(OPENGL_LIBRARIES ${OPENGLES_LIBRARY} ${EGL_LIBRARY})
 | 
			
		||||
    ADD_DEFINITIONS(-DOPENGL_ES2)
 | 
			
		||||
ELSE(USE_OPENGL_ES2)
 | 
			
		||||
    FIND_PACKAGE(OpenGL REQUIRED)
 | 
			
		||||
    FIND_PACKAGE(GLEW REQUIRED)
 | 
			
		||||
ENDIF(USE_OPENGL_ES2)
 | 
			
		||||
 | 
			
		||||
FIND_PACKAGE(Lua REQUIRED)
 | 
			
		||||
@@ -66,7 +65,9 @@ IF(USE_GCC47)
 | 
			
		||||
ENDIF(USE_GCC47)
 | 
			
		||||
 | 
			
		||||
IF(WIN32)
 | 
			
		||||
    SET(framework_SOURCES ${framework_SOURCES} ${CMAKE_CURRENT_LIST_DIR}/platform/win32window.cpp)
 | 
			
		||||
    SET(framework_SOURCES ${framework_SOURCES}
 | 
			
		||||
        ${CMAKE_CURRENT_LIST_DIR}/platform/win32window.cpp
 | 
			
		||||
        ${CMAKE_CURRENT_LIST_DIR}/platform/win32crashhandler.cpp)
 | 
			
		||||
    SET(ADDITIONAL_LIBRARIES ws2_32 mswsock)
 | 
			
		||||
 | 
			
		||||
    IF(CMAKE_COMPILER_IS_GNUCXX)
 | 
			
		||||
@@ -89,13 +90,17 @@ ELSE(WIN32)
 | 
			
		||||
        ADD_DEFINITIONS(-D_GLIBCXX__PTHREADS)
 | 
			
		||||
    ENDIF(USE_GCC47)
 | 
			
		||||
    SET(ADDITIONAL_LIBRARIES X11 dl)
 | 
			
		||||
    SET(framework_SOURCES ${framework_SOURCES} ${CMAKE_CURRENT_LIST_DIR}/platform/x11window.cpp)
 | 
			
		||||
    SET(framework_SOURCES ${framework_SOURCES}
 | 
			
		||||
        ${CMAKE_CURRENT_LIST_DIR}/platform/x11window.cpp
 | 
			
		||||
        ${CMAKE_CURRENT_LIST_DIR}/platform/unixcrashhandler.cpp)
 | 
			
		||||
ENDIF(WIN32)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
INCLUDE_DIRECTORIES(
 | 
			
		||||
    ${Boost_INCLUDE_DIRS}
 | 
			
		||||
    ${OPENGL_INCLUDE_DIR}
 | 
			
		||||
    ${EGL_INCLUDE_DIR}
 | 
			
		||||
    ${OPENGLES_INCLUDE_DIR}
 | 
			
		||||
    ${LUA_INCLUDE_DIR}
 | 
			
		||||
    ${PHYSFS_INCLUDE_DIR}
 | 
			
		||||
    ${GMP_INCLUDE_DIR}
 | 
			
		||||
@@ -105,7 +110,9 @@ INCLUDE_DIRECTORIES(
 | 
			
		||||
 | 
			
		||||
SET(framework_LIBRARIES
 | 
			
		||||
    ${Boost_LIBRARIES}
 | 
			
		||||
    ${GLEW_LIBRARY}
 | 
			
		||||
    ${OPENGL_LIBRARIES}
 | 
			
		||||
    ${OPENGLES_LIBRARY}
 | 
			
		||||
    ${LUA_LIBRARIES}
 | 
			
		||||
    ${PHYSFS_LIBRARY}
 | 
			
		||||
    ${GMP_LIBRARY}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user