# setup version numbers
# TODO: Update these for each release!
set(VERSION_MAJOR 3)
-set(VERSION_MINOR 0)
+set(VERSION_MINOR 2)
set(VERSION_PATCH 0)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
# shared lib version numbers (change before release)
set(SO_MAJOR 3) # increment on backwards incompatible API/ABI changes
-set(SO_MINOR 10) # increment on backwards compatible or internal changes
+set(SO_MINOR 11) # increment on backwards compatible or internal changes
set(SO_REV 0) # if nothing else changed increment this
# FREEGLUT_BUILD_SHARED_LIBS is already a standard CMake variable, but we need to
include/GL/freeglut_std.h
)
IF(FREEGLUT_REPLACE_GLUT)
- LIST(APPEND FREEGLUT_SRCS
+ LIST(APPEND FREEGLUT_HEADERS
include/GL/glut.h
)
ENDIF()
INCLUDE(CheckIncludeFiles)
IF(UNIX AND NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND))
FIND_PACKAGE(X11 REQUIRED)
- INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
- LIST(APPEND LIBS ${X11_LIBRARIES})
+ INCLUDE_DIRECTORIES(${X11_X11_INCLUDE_PATH})
+ LIST(APPEND LIBS ${X11_X11_LIB})
IF(X11_Xrandr_FOUND)
SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE)
LIST(APPEND LIBS ${X11_Xrandr_LIB})
# '-O0 -gstabs+' helps the currently buggy GDB port
# Too late to manipulate ENV: SET(ENV{CFLAGS} "$ENV{CFLAGS} -mandroid")
# Not using _INIT variables, they seem to be used internally only
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mandroid")
+ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mandroid")
+ ENDIF()
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -gstabs+")
ENDIF()
ENDIF()