projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added API macros for additional Spaceball buttons.
[freeglut]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
8da214d
..
7fae09a
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-389,6
+389,7
@@
IF(FREEGLUT_BUILD_STATIC_LIBS)
ENDIF()
ENDIF()
+SET(LIBNAME freeglut)
IF(WIN32)
LIST(APPEND LIBS winmm)
IF(FREEGLUT_BUILD_SHARED_LIBS)
IF(WIN32)
LIST(APPEND LIBS winmm)
IF(FREEGLUT_BUILD_SHARED_LIBS)
@@
-424,8
+425,6
@@
ELSE()
ELSE()
IF(FREEGLUT_REPLACE_GLUT)
SET(LIBNAME glut)
ELSE()
IF(FREEGLUT_REPLACE_GLUT)
SET(LIBNAME glut)
- ELSE()
- SET(LIBNAME freeglut)
ENDIF()
ENDIF()
ENDIF()
ENDIF()
@@
-477,12
+476,6
@@
IF(FREEGLUT_BUILD_STATIC_LIBS)
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
INCLUDES DESTINATION include
)
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
INCLUDES DESTINATION include
)
- IF(INSTALL_PDB)
- INSTALL(FILES ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/Debug/freeglut_static${CMAKE_DEBUG_POSTFIX}.pdb
- DESTINATION lib
- CONFIGURATIONS Debug
- COMPONENT Devel)
- ENDIF()
ENDIF()
INSTALL(FILES ${FREEGLUT_HEADERS} DESTINATION include/GL COMPONENT Devel)
ENDIF()
INSTALL(FILES ${FREEGLUT_HEADERS} DESTINATION include/GL COMPONENT Devel)
@@
-569,7
+562,7
@@
ELSE()
ENDIF()
# Client applications need to define FreeGLUT GLES version to
# bootstrap headers inclusion in freeglut_std.h:
ENDIF()
# Client applications need to define FreeGLUT GLES version to
# bootstrap headers inclusion in freeglut_std.h:
-SET(PC_LIBNAME "glut")
+SET(PC_LIBNAME ${LIBNAME})
SET(PC_FILENAME "freeglut.pc")
IF(FREEGLUT_GLES)
SET(PC_CFLAGS "-DFREEGLUT_GLES")
SET(PC_FILENAME "freeglut.pc")
IF(FREEGLUT_GLES)
SET(PC_CFLAGS "-DFREEGLUT_GLES")