Merge remote-tracking branch 'svn/trunk' into git_master
This commit is contained in:
Diederick Niehorster
commit
27d5d26426
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -3,7 +3,6 @@ freeglut/freeglut/AUTHORS svn_keywords=Author+Date+Id+Revision
|
||||
freeglut/freeglut/CMakeLists.txt svn_keywords=Author+Date+Id+Revision
|
||||
freeglut/freeglut/COPYING svn_keywords=Author+Date+Id+Revision
|
||||
freeglut/freeglut/ChangeLog svn_keywords=Author+Date+Id+Revision
|
||||
freeglut/freeglut/FrequentlyAskedQuestions -text
|
||||
freeglut/freeglut/LISEZMOI.cygwin_mingw svn_keywords=Author+Date+Id+Revision
|
||||
freeglut/freeglut/LISEZ_MOI svn_keywords=Author+Date+Id+Revision
|
||||
freeglut/freeglut/NEWS svn_keywords=Author+Date+Id+Revision
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
|
||||
PROJECT(freeglut)
|
||||
|
||||
# for multiarch LIBDIR support (requires cmake>=2.8.8)
|
||||
INCLUDE(GNUInstallDirs)
|
||||
|
||||
# NOTE: On Windows and Cygwin, the dll's are placed in the
|
||||
# CMAKE_RUNTIME_OUTPUT_DIRECTORY, while their corresponding import
|
||||
# libraries end up in CMAKE_ARCHIVE_OUTPUT_DIRECTORY. On other
|
||||
@ -254,6 +257,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC)
|
||||
INCLUDE(CheckIncludeFiles)
|
||||
IF(UNIX AND NOT(ANDROID OR BLACKBERRY))
|
||||
FIND_PACKAGE(X11 REQUIRED)
|
||||
INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
|
||||
LIST(APPEND LIBS ${X11_LIBRARIES})
|
||||
IF(X11_Xrandr_FOUND)
|
||||
SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE)
|
||||
@ -261,10 +265,6 @@ IF(UNIX AND NOT(ANDROID OR BLACKBERRY))
|
||||
ENDIF()
|
||||
IF(X11_xf86vmode_FOUND)
|
||||
SET(HAVE_X11_EXTENSIONS_XF86VMODE_H TRUE)
|
||||
# Work-around http://www.cmake.org/Bug/bug_view_page.php?bug_id=6976
|
||||
IF(NOT "${X11_Xxf86vm_LIB}")
|
||||
SET(X11_Xxf86vm_LIB "Xxf86vm")
|
||||
ENDIF()
|
||||
LIST(APPEND LIBS ${X11_Xxf86vm_LIB})
|
||||
ENDIF()
|
||||
IF(X11_Xinput_FOUND)
|
||||
@ -325,7 +325,7 @@ ENDIF()
|
||||
# ensure that all CMake-generated files are kept away from the main source tree.
|
||||
# As a result, the build directory must to be added to the include path list.
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h)
|
||||
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/src)
|
||||
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/src)
|
||||
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
|
||||
IF(WIN32)
|
||||
# we also have to generate freeglut.rc, which contains the version
|
||||
@ -413,8 +413,8 @@ ENDIF()
|
||||
IF(FREEGLUT_BUILD_SHARED_LIBS)
|
||||
INSTALL(TARGETS freeglut
|
||||
RUNTIME DESTINATION bin
|
||||
LIBRARY DESTINATION lib
|
||||
ARCHIVE DESTINATION lib
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
)
|
||||
IF(INSTALL_PDB)
|
||||
INSTALL(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug/freeglut${CMAKE_DEBUG_POSTFIX}.pdb
|
||||
@ -425,8 +425,8 @@ ENDIF()
|
||||
IF(FREEGLUT_BUILD_STATIC_LIBS)
|
||||
INSTALL(TARGETS freeglut_static
|
||||
RUNTIME DESTINATION bin
|
||||
LIBRARY DESTINATION lib
|
||||
ARCHIVE DESTINATION lib
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
)
|
||||
IF(INSTALL_PDB)
|
||||
INSTALL(FILES ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/Debug/freeglut_static${CMAKE_DEBUG_POSTFIX}.pdb
|
||||
@ -522,6 +522,6 @@ IF(FREEGLUT_GLES)
|
||||
SET(PC_FILENAME "freeglut-gles.pc")
|
||||
ENDIF()
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/freeglut.pc.in ${CMAKE_BINARY_DIR}/freeglut.pc @ONLY)
|
||||
INSTALL(FILES ${CMAKE_BINARY_DIR}/freeglut.pc DESTINATION share/pkgconfig/ RENAME ${PC_FILENAME})
|
||||
INSTALL(FILES ${CMAKE_BINARY_DIR}/freeglut.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ RENAME ${PC_FILENAME})
|
||||
# TODO: change the library and .pc name when building for GLES,
|
||||
# e.g. -lglut-GLES
|
||||
|
||||
@ -1,70 +0,0 @@
|
||||
========== ===== ========= ===== ========
|
||||
FREQUENTLY ASKED QUESTIONS ABOUT freeglut
|
||||
========== ===== ========= ===== ========
|
||||
|
||||
Last updated on November 28, 2006
|
||||
|
||||
|
||||
General Questions
|
||||
======= =========
|
||||
(1) Will "freeglut" ever support (fill in the blank)?
|
||||
|
||||
If the GLUT library supports the feature, "freeglut" should support it. If "freeglut" does not support it and there is a call for it, then we are certainly open to adding it.
|
||||
|
||||
If the GLUT library does not support the feature, "freeglut" is probably not going to. The "freeglut" library was designed to be a drop-in replacement for GLUT, a lightweight and simple windowing system for the OpenGL Red Book demonstration programs and no more. If you want a more functional windowing system we suggest that you look elsewhere.
|
||||
|
||||
(#) I have a question that is not answered here. What do I do to get an answer?
|
||||
|
||||
Check the "README" files that came with the distribution. If the question is not addressed there, please post it on the "freeglut-developer" mailing list on the Source Forge web site.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*nix Questions
|
||||
==== =========
|
||||
|
||||
(1) How I can build "freeglut" with debugging symbols and traces?
|
||||
|
||||
CFLAGS="-g $CFLAGS" LDFLAGS="-g $LDFLAGS" ./configure \
|
||||
--enable-debug
|
||||
|
||||
|
||||
(2) How can I have both a normal, and a debug-enabled version of "freeglut"?
|
||||
|
||||
cd ..
|
||||
mkdir freeglut-normal
|
||||
cd freeglut-normal
|
||||
../freeglut-2.x/configure
|
||||
make
|
||||
cd ..
|
||||
mkdir freeglut-debug
|
||||
CFLAGS="-g $CFLAGS" LDFLAGS="-g $LDFLAGS" \
|
||||
../freeglut-2.x/ configure --enable-debug [*]
|
||||
make
|
||||
|
||||
[*] optionally use --program-suffix=dbg to have them coexist when installing
|
||||
|
||||
|
||||
(3) My linking fails due to undefined symbols. What libraries do I need to link?
|
||||
|
||||
Look at the generated libfreeglut.la or use libtool --link (see the libtool manual).
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Windows Questions
|
||||
======= =========
|
||||
|
||||
(1) My linking fails due to undefined symbols. What libraries do I need to link?
|
||||
|
||||
All the required libraries (and a couple of unnecessary ones) should be automatically included thanks to the "#pragma comment (lib" statements in "freeglut_std.h". If your linking fails due to undefined symbols, there is an excellent chance that "freeglut" is not the culprit.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Other Operating System Questions
|
||||
===== ========= ====== =========
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
prefix=@CMAKE_INSTALL_PREFIX@
|
||||
libdir=${prefix}/lib
|
||||
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
|
||||
includedir=${prefix}/include
|
||||
|
||||
Name: glut
|
||||
|
||||
@ -40,6 +40,10 @@
|
||||
#include "x11/fg_window_x11_glx.h"
|
||||
#endif
|
||||
|
||||
#ifndef HOST_NAME_MAX
|
||||
#define HOST_NAME_MAX 255
|
||||
#endif
|
||||
|
||||
/* Motif window hints, only define needed ones */
|
||||
typedef struct
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user