From: <fa...@us...> - 2012-01-08 04:59:19
|
Revision: 971 http://freeglut.svn.sourceforge.net/freeglut/?rev=971&view=rev Author: fayjf Date: 2012-01-08 04:59:13 +0000 (Sun, 08 Jan 2012) Log Message: ----------- Getting "cmake" to work on MSVC 6.0. Instructions are in e-mail from David Brown dated 1/3/2012 at 11:43 PM. Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-01-08 04:37:34 UTC (rev 970) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-01-08 04:59:13 UTC (rev 971) @@ -29,11 +29,11 @@ src/freeglut_xinput.c ) -IF(WIN32) - LIST(APPEND FREEGLUT_SRCS src/freeglut_windows.c) -ELSE() - LIST(APPEND FREEGLUT_SRCS src/freeglut_x11.c) -ENDIF() +#IF(WIN32) +# LIST(APPEND FREEGLUT_SRCS src/freeglut_windows.c) +#ELSE() +# LIST(APPEND FREEGLUT_SRCS src/freeglut_x11.c) +#ENDIF() # Neatly organize all of the output files in the build directory SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) @@ -100,11 +100,11 @@ ENDMACRO() ADD_DEMO(CallbackMaker progs/demos/CallbackMaker/CallbackMaker.c) -ADD_DEMO(Fractals progs/demos/Fractals/Fractals.c) -ADD_DEMO(Fractals_random progs/demos/Fractals_random/Fractals_random.c) -ADD_DEMO(Lorenz progs/demos/Lorenz/Lorenz.c) -ADD_DEMO(One progs/demos/One/One.c) -ADD_DEMO(Resizer progs/demos/Resizer/Resizer.c) +ADD_DEMO(Fractals progs/demos/Fractals/fractals.c) +ADD_DEMO(Fractals_random progs/demos/Fractals_random/fractals_random.c) +ADD_DEMO(Lorenz progs/demos/Lorenz/lorenz.c) +ADD_DEMO(One progs/demos/One/one.c) +ADD_DEMO(Resizer progs/demos/Resizer/Resizer.cpp) ADD_DEMO(shapes progs/demos/shapes/shapes.c) ADD_DEMO(smooth_opengl3 progs/demos/smooth_opengl3/smooth_opengl3.c) ADD_DEMO(spaceball progs/demos/spaceball/spaceball.c) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2012-01-08 19:25:39
|
Revision: 972 http://freeglut.svn.sourceforge.net/freeglut/?rev=972&view=rev Author: fayjf Date: 2012-01-08 19:25:33 +0000 (Sun, 08 Jan 2012) Log Message: ----------- Fixing the "cmake" inputs to build the "spaceball" demo properly per e-mail from Paul Martz dated 1/8/12 at 12:03 PM Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-01-08 04:59:13 UTC (rev 971) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-01-08 19:25:33 UTC (rev 972) @@ -107,7 +107,9 @@ ADD_DEMO(Resizer progs/demos/Resizer/Resizer.cpp) ADD_DEMO(shapes progs/demos/shapes/shapes.c) ADD_DEMO(smooth_opengl3 progs/demos/smooth_opengl3/smooth_opengl3.c) -ADD_DEMO(spaceball progs/demos/spaceball/spaceball.c) +ADD_DEMO(spaceball progs/demos/spaceball/spaceball.c + progs/demos/spaceball/vmath.c + progs/demos/spaceball/vmath.h) ADD_DEMO(subwin progs/demos/subwin/subwin.c) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2012-02-04 05:10:57
|
Revision: 1036 http://freeglut.svn.sourceforge.net/freeglut/?rev=1036&view=rev Author: fayjf Date: 2012-02-04 05:10:51 +0000 (Sat, 04 Feb 2012) Log Message: ----------- Fixing "cmake" with the new location of the "freeglut_xinput_x11.c" file Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-02-04 05:01:29 UTC (rev 1035) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-02-04 05:10:51 UTC (rev 1036) @@ -34,7 +34,6 @@ src/Common/freeglut_teapot.c src/Common/freeglut_videoresize.c src/Common/freeglut_window.c - src/Common/freeglut_xinput.c ) IF(WIN32) @@ -71,6 +70,7 @@ src/x11/freeglut_state_x11.c src/x11/freeglut_structure_x11.c src/x11/freeglut_window_x11.c + src/x11/freeglut_xinput_x11.c ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2012-02-07 01:56:56
|
Revision: 1075 http://freeglut.svn.sourceforge.net/freeglut/?rev=1075&view=rev Author: fayjf Date: 2012-02-07 01:56:50 +0000 (Tue, 07 Feb 2012) Log Message: ----------- Putting in many 'CMakeLists.txt' fixes per e-mail from John Tsiombikas dated February 6, 2012 at 4:38 AM Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-02-07 01:52:10 UTC (rev 1074) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-02-07 01:56:50 UTC (rev 1075) @@ -81,7 +81,8 @@ # BUILD_SHARED_LIBS is already a standard CMake variable, but we need to # re-declare it here so it will show up in the GUI. -OPTION(BUILD_SHARED_LIBS "Build FreeGLUT as a shared library." ON) +OPTION(BUILD_SHARED_LIBS "Build FreeGLUT shared library." ON) +OPTION(BUILD_STATIC_LIBS "Build FreeGLUT static library." ON) FIND_PACKAGE(OpenGL REQUIRED) @@ -92,10 +93,20 @@ ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) ENDIF() +if(UNIX) + FIND_PACKAGE(X11 REQUIRED) + LIST(APPEND LIBS ${X11_LIBRARIES}) + IF(X11_Xrandr_FOUND) + SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE) + LIST(APPEND LIBS ${X11_Xrandr_LIB}) + ENDIF() + IF(X11_xf86vmode_FOUND) + SET(HAVE_X11_EXTENSIONS_XF86VMODE_H TRUE) + LIST(APPEND LIBS ${X11_xf86vmode_LIB}) + ENDIF() +ENDIF() + INCLUDE(CheckIncludeFiles) - -CHECK_INCLUDE_FILES(X11/extensions/xf86vmode.h HAVE_X11_EXTENSIONS_XF86VMODE_H) -CHECK_INCLUDE_FILES(X11/extensions/Xrandr.h HAVE_X11_EXTENSIONS_XRANDR_H) CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H) CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H) CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H) @@ -113,33 +124,57 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) ADD_DEFINITIONS(-DHAVE_CONFIG_H) +# by default, at least on UNIX, we want to build both IF(BUILD_SHARED_LIBS) - IF(WIN32) + ADD_LIBRARY(freeglut SHARED ${FREEGLUT_SRCS}) +ENDIF() +IF(BUILD_STATIC_LIBS) + ADD_LIBRARY(freeglut_static STATIC ${FREEGLUT_SRCS}) +ENDIF() + + +IF(WIN32) + IF(BUILD_SHARED_LIBS) LIST(APPEND FREEGLUT_SRCS src/Common/freeglutdll.def freeglut.rc) + # XXX I assume that if we want both shared and static this one is appropriate + ADD_DEFINITIONS(-DFREEGLUT_EXPORTS) + ELSE() + ADD_DEFINITIONS(-DFREEGLUT_STATIC) ENDIF() - ADD_DEFINITIONS(-DFREEGLUT_EXPORTS) ELSE() - ADD_DEFINITIONS(-DFREEGLUT_STATIC) + # on UNIX we need to make sure: + # - all shared libraries must have a soname/version + # - the output library should be named glut so it'll be linkable with -lglut + # - the shared library should link to the dependency libraries so that the user + # won't have to link them explicitly (they shouldn't have to know that we depend + # on Xrandr or Xxf86vm) + SET_TARGET_PROPERTIES(freeglut PROPERTIES VERSION 3.9.0 SOVERSION 3 OUTPUT_NAME glut) + SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME glut) + TARGET_LINK_LIBRARIES(freeglut ${LIBS}) ENDIF() -# The default library type is determined by BUILD_SHARED_LIBS -ADD_LIBRARY(freeglut ${FREEGLUT_SRCS}) - -IF(NOT BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES(freeglut PROPERTIES OUTPUT_NAME freeglut_static) +IF(BUILD_SHARED_LIBS) + INSTALL(TARGETS freeglut DESTINATION lib) ENDIF() - -INSTALL(TARGETS freeglut DESTINATION lib) +IF(BUILD_STATIC_LIBS) + INSTALL(TARGETS freeglut_static DESTINATION lib) +ENDIF() INSTALL(FILES ${FREEGLUT_HEADERS} DESTINATION include/GL) + + # Optionally build demos, on by default. option( FREEGLUT_BUILD_DEMOS "Build FreeGLUT demos." ON ) +SET(DEMO_LIBS ${OPENGL_LIBRARY} ${LIBS}) MACRO(ADD_DEMO name) if( FREEGLUT_BUILD_DEMOS ) ADD_EXECUTABLE(${name} ${ARGN}) - TARGET_LINK_LIBRARIES(${name} freeglut) - INSTALL(TARGETS ${name} DESTINATION bin) + IF(BUILD_SHARED_LIBS) + TARGET_LINK_LIBRARIES(${name} ${DEMO_LIBS} freeglut) + ELSE() + TARGET_LINK_LIBRARIES(${name} ${DEMO_LIBS} freeglut_static) + ENDIF() endif() ENDMACRO() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-03-09 19:17:43
|
Revision: 1083 http://freeglut.svn.sourceforge.net/freeglut/?rev=1083&view=rev Author: beuc Date: 2012-03-09 19:17:37 +0000 (Fri, 09 Mar 2012) Log Message: ----------- Fix X86vmode library detection Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-03-08 02:31:00 UTC (rev 1082) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-03-09 19:17:37 UTC (rev 1083) @@ -102,7 +102,11 @@ ENDIF() IF(X11_xf86vmode_FOUND) SET(HAVE_X11_EXTENSIONS_XF86VMODE_H TRUE) - LIST(APPEND LIBS ${X11_xf86vmode_LIB}) + # 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() ENDIF() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-03-09 19:25:03
|
Revision: 1084 http://freeglut.svn.sourceforge.net/freeglut/?rev=1084&view=rev Author: beuc Date: 2012-03-09 19:24:57 +0000 (Fri, 09 Mar 2012) Log Message: ----------- Add maths library for demos Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-03-09 19:17:37 UTC (rev 1083) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-03-09 19:24:57 UTC (rev 1084) @@ -173,6 +173,8 @@ option( FREEGLUT_BUILD_DEMOS "Build FreeGLUT demos." ON ) SET(DEMO_LIBS ${OPENGL_LIBRARY} ${LIBS}) +SET(DEMO_LIBS ${LIBS} m) + MACRO(ADD_DEMO name) if( FREEGLUT_BUILD_DEMOS ) ADD_EXECUTABLE(${name} ${ARGN}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-03-09 19:49:55
|
Revision: 1085 http://freeglut.svn.sourceforge.net/freeglut/?rev=1085&view=rev Author: beuc Date: 2012-03-09 19:49:49 +0000 (Fri, 09 Mar 2012) Log Message: ----------- Properly add maths library for demos Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-03-09 19:24:57 UTC (rev 1084) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-03-09 19:49:49 UTC (rev 1085) @@ -173,7 +173,7 @@ option( FREEGLUT_BUILD_DEMOS "Build FreeGLUT demos." ON ) SET(DEMO_LIBS ${OPENGL_LIBRARY} ${LIBS}) -SET(DEMO_LIBS ${LIBS} m) +LIST(APPEND DEMO_LIBS m) MACRO(ADD_DEMO name) if( FREEGLUT_BUILD_DEMOS ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-03-11 09:18:21
|
Revision: 1102 http://freeglut.svn.sourceforge.net/freeglut/?rev=1102&view=rev Author: beuc Date: 2012-03-11 09:18:15 +0000 (Sun, 11 Mar 2012) Log Message: ----------- CMake: option to build with OpenGL ES Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-03-11 08:55:24 UTC (rev 1101) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-03-11 09:18:15 UTC (rev 1102) @@ -86,10 +86,22 @@ OPTION(BUILD_SHARED_LIBS "Build FreeGLUT shared library." ON) OPTION(BUILD_STATIC_LIBS "Build FreeGLUT static library." ON) -FIND_PACKAGE(OpenGL REQUIRED) -INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) -LIST(APPEND LIBS ${OPENGL_gl_LIBRARY}) +# OpenGL ES support +OPTION(FREEGLUT_GLES1 "Use OpenGL ES 1.x (requires EGL)" OFF) +OPTION(FREEGLUT_GLES2 "Use OpenGL ES 2.x (requires EGL) (overrides BUILD_GLES1)" OFF) +IF(FREEGLUT_GLES2) + ADD_DEFINITIONS(-DGLESv2) + LIST(APPEND LIBS GLESv2 EGL) +ELSEIF(FREEGLUT_GLES1) + ADD_DEFINITIONS(-DGLESv1) + LIST(APPEND LIBS GLESv1 EGL) +ELSE() + FIND_PACKAGE(OpenGL REQUIRED) + LIST(APPEND LIBS ${OPENGL_gl_LIBRARY}) + INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) +ENDIF() + # lib m for math, not needed on windows IF (NOT WIN32) LIST(APPEND LIBS m) @@ -100,7 +112,7 @@ ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) ENDIF() -if(UNIX) +if(UNIX AND NOT ANDROID) FIND_PACKAGE(X11 REQUIRED) LIST(APPEND LIBS ${X11_LIBRARIES}) IF(X11_Xrandr_FOUND) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-03-11 09:53:28
|
Revision: 1109 http://freeglut.svn.sourceforge.net/freeglut/?rev=1109&view=rev Author: beuc Date: 2012-03-11 09:53:22 +0000 (Sun, 11 Mar 2012) Log Message: ----------- CMake: add precision about version-info / soname Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-03-11 09:45:20 UTC (rev 1108) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-03-11 09:53:22 UTC (rev 1109) @@ -199,8 +199,10 @@ ENDIF() ELSE() # on UNIX we need to make sure: - # - all shared libraries must have a soname/version (see - # http://sourceware.org/autobook/autobook/autobook_91.html#SEC91) + # - all shared libraries must have a soname/version, see : + # http://sourceware.org/autobook/autobook/autobook_91.html#SEC91 + # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html + # Current: -version-info 12:0:9 -> 3.9.0 # - the output library should be named glut so it'll be linkable with -lglut # - the shared library should link to the dependency libraries so that the user # won't have to link them explicitly (they shouldn't have to know that we depend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dc...@us...> - 2012-03-12 04:24:46
|
Revision: 1117 http://freeglut.svn.sourceforge.net/freeglut/?rev=1117&view=rev Author: dcnieho Date: 2012-03-12 04:24:40 +0000 (Mon, 12 Mar 2012) Log Message: ----------- now only setting FREEGLUT_EXPORTS and FREEGLUT_STATIC for the shared and static dll/lib respectively, instead of globally defining those for all targets That revealed the static build of the demos is broken, needed to add the FREEGLUT_STATIC definition there too Not including .def file on windows if 64 bit build. Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-03-12 03:32:53 UTC (rev 1116) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-03-12 04:24:40 UTC (rev 1117) @@ -33,15 +33,15 @@ # Android port requires adding a version of these compatible with # OpenGL ES (TODO): IF(NOT ANDROID) - LIST(APPEND FREEGLUT_SRCS - src/fg_font.c - src/fg_geometry.c - src/fg_menu.c - src/fg_teapot.c + LIST(APPEND FREEGLUT_SRCS + src/fg_font.c + src/fg_geometry.c + src/fg_menu.c + src/fg_teapot.c ) ENDIF() -IF(WIN32) # TODO: is this true for 64 bit as well? Chaneg to WINDOWS? +IF(WIN32) LIST(APPEND FREEGLUT_SRCS src/mswin/fg_cursor_mswin.c src/mswin/fg_display_mswin.c @@ -209,12 +209,16 @@ IF(WIN32) LIST(APPEND LIBS winmm) IF(BUILD_SHARED_LIBS) - LIST(APPEND FREEGLUT_SRCS src/Common/freeglutdll.def freeglut.rc) - # XXX I assume that if we want both shared and static this one is appropriate - ADD_DEFINITIONS(-DFREEGLUT_EXPORTS) - ELSE() - ADD_DEFINITIONS(-DFREEGLUT_STATIC) + LIST(APPEND FREEGLUT_SRCS freeglut.rc) + IF (NOT CMAKE_CL_64) + # .def file only for 32bit Windows builds + LIST(APPEND FREEGLUT_SRCS src/Common/freeglutdll.def) + ENDIF() + SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS) ENDIF() + IF(BUILD_STATIC_LIBS) + SET_TARGET_PROPERTIES(freeglut_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC) + ENDIF() ELSE() # on UNIX we need to make sure: # - all shared libraries must have a soname/version, see : @@ -276,6 +280,7 @@ IF(BUILD_STATIC_LIBS) ADD_EXECUTABLE(${name}_static ${ARGN}) TARGET_LINK_LIBRARIES(${name}_static ${DEMO_LIBS} freeglut_static) + SET_TARGET_PROPERTIES(${name}_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC) ENDIF() ENDIF() ENDMACRO() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dc...@us...> - 2012-03-12 07:26:43
|
Revision: 1119 http://freeglut.svn.sourceforge.net/freeglut/?rev=1119&view=rev Author: dcnieho Date: 2012-03-12 07:26:37 +0000 (Mon, 12 Mar 2012) Log Message: ----------- cleaneup \machine setting for MSVC, now only for 64bit static libs, only onwe for which needed. Added a comment showing why its needed Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-03-12 05:07:35 UTC (rev 1118) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-03-12 07:26:37 UTC (rev 1119) @@ -216,22 +216,14 @@ LIST(APPEND LIBS winmm) IF(BUILD_SHARED_LIBS) SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS) - IF (CMAKE_CL_64) - # 64bit build - SET_TARGET_PROPERTIES(freeglut PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") - ELSE() - # 32bit build - SET_TARGET_PROPERTIES(freeglut PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x86") - ENDIF() ENDIF() IF(BUILD_STATIC_LIBS) SET_TARGET_PROPERTIES(freeglut_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC) + # need to set machine:x64 for linker, at least for VC10, and + # doesn't hurt for older compilers: + # http://public.kitware.com/Bug/view.php?id=11240#c22768 IF (CMAKE_CL_64) - # 64bit build SET_TARGET_PROPERTIES(freeglut_static PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") - ELSE() - # 32bit build - SET_TARGET_PROPERTIES(freeglut_static PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x86") ENDIF() ENDIF() ELSE() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dc...@us...> - 2012-03-12 15:41:45
|
Revision: 1120 http://freeglut.svn.sourceforge.net/freeglut/?rev=1120&view=rev Author: dcnieho Date: 2012-03-12 15:41:39 +0000 (Mon, 12 Mar 2012) Log Message: ----------- added to CMake a setup to copy shared lib (MSVC only right now) and fractals.dat to demo binary folder if demos are built Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-03-12 07:26:37 UTC (rev 1119) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-03-12 15:41:39 UTC (rev 1120) @@ -1,6 +1,10 @@ PROJECT(freeglut) CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) +SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) + + SET(FREEGLUT_HEADERS include/GL/freeglut.h include/GL/freeglut_ext.h @@ -305,3 +309,33 @@ progs/demos/spaceball/vmath.h) ADD_DEMO(subwin progs/demos/subwin/subwin.c) ADD_DEMO(timer progs/demos/timer/timer.c) + +# finally, if any demos are built, copy needed files to output directory +# (currently, 1) dll, and 2) input for Fractals demo) +IF(FREEGLUT_BUILD_DEMOS) + # 1) copy dll. Make it an action to occur after freeglut dll is + # built, otherwise we'd have to hijack one of the demos above to do + # it. Not sure whats cleaner really... MSVC only for now... + GET_TARGET_PROPERTY(DEMO_OUTPUT_DIRECTORY CallbackMaker RUNTIME_OUTPUT_DIRECTORY) + GET_TARGET_PROPERTY(LIB_OUTPUT_DIRECTORY freeglut LIBRARY_OUTPUT_DIRECTORY) + if(MSVC AND BUILD_SHARED_LIBS) + # $(Configuration) gets replaced by MSBuild (not by CMake) with + # Debug, Release or whatever the current build is. + ADD_CUSTOM_COMMAND( + TARGET freeglut + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + ${LIB_OUTPUT_DIRECTORY}/$(Configuration)/freeglut${CMAKE_SHARED_LIBRARY_SUFFIX} + ${DEMO_OUTPUT_DIRECTORY}/$(Configuration) + ) + ENDIF() + + # 2) copy fractals.dat from freeglut/progs/demos/Fractals + ADD_CUSTOM_COMMAND( + TARGET freeglut + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + ${PROJECT_SOURCE_DIR}/progs/demos/Fractals/fractals.dat + ${DEMO_OUTPUT_DIRECTORY}/$(Configuration) + ) +ENDIF() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dc...@us...> - 2012-03-15 02:34:40
|
Revision: 1136 http://freeglut.svn.sourceforge.net/freeglut/?rev=1136&view=rev Author: dcnieho Date: 2012-03-15 02:34:33 +0000 (Thu, 15 Mar 2012) Log Message: ----------- converted all tabs to spaces for CMake file, eases editing and indenting in diffs looks right Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-03-15 02:30:50 UTC (rev 1135) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-03-15 02:34:33 UTC (rev 1136) @@ -19,33 +19,33 @@ SET(FREEGLUT_HEADERS - include/GL/freeglut.h - include/GL/freeglut_ext.h - include/GL/freeglut_std.h - include/GL/glut.h + include/GL/freeglut.h + include/GL/freeglut_ext.h + include/GL/freeglut_std.h + include/GL/glut.h ) SET(FREEGLUT_SRCS - ${FREEGLUT_HEADERS} - src/fg_callbacks.c - src/fg_cursor.c - src/fg_display.c - src/fg_ext.c - src/fg_font_data.c - src/fg_gamemode.c - src/fg_init.c - src/fg_internal.h - src/fg_input_devices.c - src/fg_joystick.c - src/fg_main.c - src/fg_misc.c - src/fg_overlay.c - src/fg_spaceball.c - src/fg_state.c - src/fg_stroke_mono_roman.c - src/fg_stroke_roman.c - src/fg_structure.c - src/fg_videoresize.c - src/fg_window.c + ${FREEGLUT_HEADERS} + src/fg_callbacks.c + src/fg_cursor.c + src/fg_display.c + src/fg_ext.c + src/fg_font_data.c + src/fg_gamemode.c + src/fg_init.c + src/fg_internal.h + src/fg_input_devices.c + src/fg_joystick.c + src/fg_main.c + src/fg_misc.c + src/fg_overlay.c + src/fg_spaceball.c + src/fg_state.c + src/fg_stroke_mono_roman.c + src/fg_stroke_roman.c + src/fg_structure.c + src/fg_videoresize.c + src/fg_window.c ) # Android port requires adding a version of these compatible with # OpenGL ES (TODO): @@ -59,21 +59,21 @@ ENDIF() IF(WIN32) - LIST(APPEND FREEGLUT_SRCS - src/mswin/fg_cursor_mswin.c - src/mswin/fg_display_mswin.c - src/mswin/fg_ext_mswin.c - src/mswin/fg_gamemode_mswin.c - src/mswin/fg_init_mswin.c - src/mswin/fg_internal_mswin.h - src/mswin/fg_input_devices_mswin.c - src/mswin/fg_joystick_mswin.c - src/mswin/fg_main_mswin.c - src/mswin/fg_menu_mswin.c - src/mswin/fg_spaceball_mswin.c - src/mswin/fg_state_mswin.c - src/mswin/fg_structure_mswin.c - src/mswin/fg_window_mswin.c + LIST(APPEND FREEGLUT_SRCS + src/mswin/fg_cursor_mswin.c + src/mswin/fg_display_mswin.c + src/mswin/fg_ext_mswin.c + src/mswin/fg_gamemode_mswin.c + src/mswin/fg_init_mswin.c + src/mswin/fg_internal_mswin.h + src/mswin/fg_input_devices_mswin.c + src/mswin/fg_joystick_mswin.c + src/mswin/fg_main_mswin.c + src/mswin/fg_menu_mswin.c + src/mswin/fg_spaceball_mswin.c + src/mswin/fg_state_mswin.c + src/mswin/fg_structure_mswin.c + src/mswin/fg_window_mswin.c ${CMAKE_BINARY_DIR}/freeglut.rc # generated below from freeglut.rc.in ) IF (NOT CMAKE_CL_64) @@ -104,23 +104,23 @@ src/android/fg_internal_android.h ) ELSE() - LIST(APPEND FREEGLUT_SRCS - src/x11/fg_cursor_x11.c - src/x11/fg_display_x11.c - src/x11/fg_ext_x11.c - src/x11/fg_gamemode_x11.c - src/x11/fg_glutfont_definitions_x11.c - src/x11/fg_init_x11.c - src/x11/fg_internal_x11.h - src/x11/fg_input_devices_x11.c - src/x11/fg_joystick_x11.c - src/x11/fg_main_x11.c - src/x11/fg_menu_x11.c - src/x11/fg_spaceball_x11.c - src/x11/fg_state_x11.c - src/x11/fg_structure_x11.c - src/x11/fg_window_x11.c - src/x11/fg_xinput_x11.c + LIST(APPEND FREEGLUT_SRCS + src/x11/fg_cursor_x11.c + src/x11/fg_display_x11.c + src/x11/fg_ext_x11.c + src/x11/fg_gamemode_x11.c + src/x11/fg_glutfont_definitions_x11.c + src/x11/fg_init_x11.c + src/x11/fg_internal_x11.h + src/x11/fg_input_devices_x11.c + src/x11/fg_joystick_x11.c + src/x11/fg_main_x11.c + src/x11/fg_menu_x11.c + src/x11/fg_spaceball_x11.c + src/x11/fg_state_x11.c + src/x11/fg_structure_x11.c + src/x11/fg_window_x11.c + src/x11/fg_xinput_x11.c ) ENDIF() @@ -152,25 +152,25 @@ ENDIF() IF(WIN32) - MESSAGE(WARNING "Insecure CRT warnings hidden (might want to fix these)") - ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) + MESSAGE(WARNING "Insecure CRT warnings hidden (might want to fix these)") + ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) ENDIF() if(UNIX AND NOT ANDROID) - FIND_PACKAGE(X11 REQUIRED) - LIST(APPEND LIBS ${X11_LIBRARIES}) - IF(X11_Xrandr_FOUND) - SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE) - LIST(APPEND LIBS ${X11_Xrandr_LIB}) - 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() + FIND_PACKAGE(X11 REQUIRED) + LIST(APPEND LIBS ${X11_LIBRARIES}) + IF(X11_Xrandr_FOUND) + SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE) + LIST(APPEND LIBS ${X11_Xrandr_LIB}) + 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() ENDIF() INCLUDE(CheckIncludeFiles) @@ -191,8 +191,8 @@ CHECK_FUNCTION_EXISTS(XParseGeometry HAVE_XPARSEGEOMETRY) IF (NOT HAVE_XPARSEGEOMETRY) LIST(APPEND FREEGLUT_SRCS - src/util/xparsegeometry_repl.c - src/util/xparsegeometry_repl.h) + src/util/xparsegeometry_repl.c + src/util/xparsegeometry_repl.h) SET(NEED_XPARSEGEOMETRY_IMPL TRUE) ENDIF() # decide on suitable type for internal time keeping, 64-bit if possible @@ -227,52 +227,52 @@ ENDIF() IF(BUILD_SHARED_LIBS) - ADD_LIBRARY(freeglut SHARED ${FREEGLUT_SRCS}) + ADD_LIBRARY(freeglut SHARED ${FREEGLUT_SRCS}) ENDIF() IF(BUILD_STATIC_LIBS) - ADD_LIBRARY(freeglut_static STATIC ${FREEGLUT_SRCS}) + ADD_LIBRARY(freeglut_static STATIC ${FREEGLUT_SRCS}) ENDIF() IF(WIN32) - LIST(APPEND LIBS winmm) - IF(BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS) - ENDIF() + LIST(APPEND LIBS winmm) + IF(BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS) + ENDIF() IF(BUILD_STATIC_LIBS) - SET_TARGET_PROPERTIES(freeglut_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC) + SET_TARGET_PROPERTIES(freeglut_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC) # need to set machine:x64 for linker, at least for VC10, and # doesn't hurt for older compilers: # http://public.kitware.com/Bug/view.php?id=11240#c22768 IF (CMAKE_CL_64) SET_TARGET_PROPERTIES(freeglut_static PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") ENDIF() - ENDIF() + ENDIF() ELSE() - # on UNIX we need to make sure: - # - all shared libraries must have a soname/version, see : - # http://sourceware.org/autobook/autobook/autobook_91.html#SEC91 - # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html - # Current: -version-info 12:0:9 -> 3.9.0 - # - the output library should be named glut so it'll be linkable with -lglut - # - the shared library should link to the dependency libraries so that the user - # won't have to link them explicitly (they shouldn't have to know that we depend - # on Xrandr or Xxf86vm) - SET_TARGET_PROPERTIES(freeglut PROPERTIES VERSION 3.9.0 SOVERSION 3 OUTPUT_NAME glut) - SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME glut) - IF(ANDROID) - # Not in CMake toolchain file, because the toolchain - # file is called several times and generally doesn't - # seem to be meant for it: - # '-mandroid' is not mandatory but doesn't hurt - # '-O0 -gstabs+' helps the currently buggy GDB port - # '-DANDROID' is the Android build system convention - # 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") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -gstabs+") - ADD_DEFINITIONS(-DANDROID) - ENDIF() + # on UNIX we need to make sure: + # - all shared libraries must have a soname/version, see : + # http://sourceware.org/autobook/autobook/autobook_91.html#SEC91 + # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html + # Current: -version-info 12:0:9 -> 3.9.0 + # - the output library should be named glut so it'll be linkable with -lglut + # - the shared library should link to the dependency libraries so that the user + # won't have to link them explicitly (they shouldn't have to know that we depend + # on Xrandr or Xxf86vm) + SET_TARGET_PROPERTIES(freeglut PROPERTIES VERSION 3.9.0 SOVERSION 3 OUTPUT_NAME glut) + SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME glut) + IF(ANDROID) + # Not in CMake toolchain file, because the toolchain + # file is called several times and generally doesn't + # seem to be meant for it: + # '-mandroid' is not mandatory but doesn't hurt + # '-O0 -gstabs+' helps the currently buggy GDB port + # '-DANDROID' is the Android build system convention + # 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") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -gstabs+") + ADD_DEFINITIONS(-DANDROID) + ENDIF() ENDIF() IF(BUILD_SHARED_LIBS) TARGET_LINK_LIBRARIES(freeglut ${LIBS}) @@ -282,10 +282,10 @@ ENDIF() IF(BUILD_SHARED_LIBS) - INSTALL(TARGETS freeglut DESTINATION lib) + INSTALL(TARGETS freeglut DESTINATION lib) ENDIF() IF(BUILD_STATIC_LIBS) - INSTALL(TARGETS freeglut_static DESTINATION lib) + INSTALL(TARGETS freeglut_static DESTINATION lib) ENDIF() INSTALL(FILES ${FREEGLUT_HEADERS} DESTINATION include/GL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dc...@us...> - 2012-03-15 03:08:03
|
Revision: 1138 http://freeglut.svn.sourceforge.net/freeglut/?rev=1138&view=rev Author: dcnieho Date: 2012-03-15 03:07:57 +0000 (Thu, 15 Mar 2012) Log Message: ----------- no need for a message on MSVC that we hide insecure CRT warnings Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-03-15 03:06:42 UTC (rev 1137) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-03-15 03:07:57 UTC (rev 1138) @@ -152,7 +152,7 @@ ENDIF() IF(WIN32) - MESSAGE(WARNING "Insecure CRT warnings hidden (might want to fix these)") + # hide insecure CRT warnings, common practice ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) ENDIF() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-03-16 20:43:36
|
Revision: 1158 http://freeglut.svn.sourceforge.net/freeglut/?rev=1158&view=rev Author: beuc Date: 2012-03-16 20:43:29 +0000 (Fri, 16 Mar 2012) Log Message: ----------- CMake: use same test for referencing and generating freeglutdll.def Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-03-16 11:06:23 UTC (rev 1157) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-03-16 20:43:29 UTC (rev 1158) @@ -76,7 +76,7 @@ src/mswin/fg_window_mswin.c ${CMAKE_BINARY_DIR}/freeglut.rc # generated below from freeglut.rc.in ) - IF (NOT CMAKE_CL_64) + IF (MSVC AND NOT CMAKE_CL_64) # .def file only for 32bit Windows builds LIST(APPEND FREEGLUT_SRCS ${CMAKE_BINARY_DIR}/freeglutdll.def # generated below from src/freeglutdll.def.in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-03-16 21:39:43
|
Revision: 1160 http://freeglut.svn.sourceforge.net/freeglut/?rev=1160&view=rev Author: beuc Date: 2012-03-16 21:39:37 +0000 (Fri, 16 Mar 2012) Log Message: ----------- CMake: Declare OPTIONS higher in the file so they can be used to conditionaly include source files Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-03-16 21:30:26 UTC (rev 1159) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-03-16 21:39:37 UTC (rev 1160) @@ -18,6 +18,17 @@ set(VERSION_PATCH 0) +# BUILD_SHARED_LIBS is already a standard CMake variable, but we need to +# re-declare it here so it will show up in the GUI. +# by default, we want to build both +OPTION(BUILD_SHARED_LIBS "Build FreeGLUT shared library." ON) +OPTION(BUILD_STATIC_LIBS "Build FreeGLUT static library." ON) + +# OpenGL ES support +OPTION(FREEGLUT_GLES1 "Use OpenGL ES 1.x (requires EGL)" OFF) +OPTION(FREEGLUT_GLES2 "Use OpenGL ES 2.x (requires EGL) (overrides BUILD_GLES1)" OFF) + + SET(FREEGLUT_HEADERS include/GL/freeglut.h include/GL/freeglut_ext.h @@ -47,9 +58,8 @@ src/fg_videoresize.c src/fg_window.c ) -# Android port requires adding a version of these compatible with -# OpenGL ES (TODO): -IF(NOT ANDROID) +# TODO: OpenGL ES requires a compatible version of these files: +IF(NOT FREEGLUT_GLES2 AND NOT FREEGLUT_GLES1) LIST(APPEND FREEGLUT_SRCS src/fg_font.c src/fg_geometry.c @@ -124,16 +134,6 @@ ) ENDIF() -# BUILD_SHARED_LIBS is already a standard CMake variable, but we need to -# re-declare it here so it will show up in the GUI. -# by default, we want to build both -OPTION(BUILD_SHARED_LIBS "Build FreeGLUT shared library." ON) -OPTION(BUILD_STATIC_LIBS "Build FreeGLUT static library." ON) - -# OpenGL ES support -OPTION(FREEGLUT_GLES1 "Use OpenGL ES 1.x (requires EGL)" OFF) -OPTION(FREEGLUT_GLES2 "Use OpenGL ES 2.x (requires EGL) (overrides BUILD_GLES1)" OFF) - # For OpenGL ES (GLES): # - compile with -DFREEGLUT_GLES1 and -DFREEGLUT_GLES2 to cleanly # bootstrap headers inclusion in freeglut_std.h; these constants This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dc...@us...> - 2012-03-18 09:59:56
|
Revision: 1191 http://freeglut.svn.sourceforge.net/freeglut/?rev=1191&view=rev Author: dcnieho Date: 2012-03-18 09:59:50 +0000 (Sun, 18 Mar 2012) Log Message: ----------- teapot header not in list of files (so doesn't show up in IDE) Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-03-18 07:37:08 UTC (rev 1190) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-03-18 09:59:50 UTC (rev 1191) @@ -65,6 +65,7 @@ src/fg_geometry.c src/fg_menu.c src/fg_teapot.c + src/fg_teapot_data.h ) ELSE() LIST(APPEND FREEGLUT_SRCS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-03-18 10:25:26
|
Revision: 1194 http://freeglut.svn.sourceforge.net/freeglut/?rev=1194&view=rev Author: beuc Date: 2012-03-18 10:25:19 +0000 (Sun, 18 Mar 2012) Log Message: ----------- pkg-config: add -lm to static libraries Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-03-18 10:24:21 UTC (rev 1193) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-03-18 10:25:19 UTC (rev 1194) @@ -363,21 +363,21 @@ # pkg-config support, to install at $(libdir)/pkgconfig # Define static build dependencies IF(WIN32) - SET(PC_LIBS_PRIVATE "-lopengl32 -lwinmm -lgdi32") + SET(PC_LIBS_PRIVATE "-lopengl32 -lwinmm -lgdi32 -lm") ELSEIF(FREEGLUT_GLES2) IF(ANDROID) - SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv2 -lEGL") + SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv2 -lEGL -lm") ELSE() - SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv2 -lEGL") + SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv2 -lEGL -lm") ENDIF() ELSEIF(FREEGLUT_GLES1) IF(ANDROID) - SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv1_CM -lEGL") + SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv1_CM -lEGL -lm") ELSE() - SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv1_CM -lEGL") + SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv1_CM -lEGL -lm") ENDIF() ELSE() - SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGL") + SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGL -lm") ENDIF() # Client applications need to define FreeGLUT GLES version to # bootstrap headers inclusion in freeglut_std.h: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-03-23 19:04:02
|
Revision: 1204 http://freeglut.svn.sourceforge.net/freeglut/?rev=1204&view=rev Author: beuc Date: 2012-03-23 19:03:56 +0000 (Fri, 23 Mar 2012) Log Message: ----------- Keep fg_geometry in normal builds\! Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-03-23 19:01:05 UTC (rev 1203) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-03-23 19:03:56 UTC (rev 1204) @@ -65,6 +65,7 @@ src/fg_menu.c src/fg_teapot.c src/fg_teapot_data.h + src/fg_geometry.c ) ELSE() LIST(APPEND FREEGLUT_SRCS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-04-21 16:54:08
|
Revision: 1255 http://freeglut.svn.sourceforge.net/freeglut/?rev=1255&view=rev Author: beuc Date: 2012-04-21 16:53:57 +0000 (Sat, 21 Apr 2012) Log Message: ----------- Add more compiler checks for GCC Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-04-21 16:50:38 UTC (rev 1254) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-04-21 16:53:57 UTC (rev 1255) @@ -195,6 +195,14 @@ ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) ENDIF() +IF(CMAKE_COMPILER_IS_GNUCC) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic") + IF(!ANDROID) + # not setting -ansi as EGL/KHR headers doesn't support it + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ansi") + ENDIF() +ENDIF(CMAKE_COMPILER_IS_GNUCC) + if(UNIX AND NOT ANDROID) FIND_PACKAGE(X11 REQUIRED) LIST(APPEND LIBS ${X11_LIBRARIES}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-05-01 09:33:11
|
Revision: 1273 http://freeglut.svn.sourceforge.net/freeglut/?rev=1273&view=rev Author: beuc Date: 2012-05-01 09:33:05 +0000 (Tue, 01 May 2012) Log Message: ----------- Android: reference android library dependencies, needed for shared libs builds Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-04-30 15:19:59 UTC (rev 1272) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-05-01 09:33:05 UTC (rev 1273) @@ -203,7 +203,7 @@ ENDIF() ENDIF(CMAKE_COMPILER_IS_GNUCC) -if(UNIX AND NOT ANDROID) +IF(UNIX AND NOT ANDROID) FIND_PACKAGE(X11 REQUIRED) LIST(APPEND LIBS ${X11_LIBRARIES}) IF(X11_Xrandr_FOUND) @@ -219,6 +219,11 @@ LIST(APPEND LIBS ${X11_Xxf86vm_LIB}) ENDIF() ENDIF() +IF(ANDROID) + # -landroid for ANativeWindow + # -llog for native Android logging + LIST(APPEND LIBS android log) +ENDIF() INCLUDE(CheckIncludeFiles) INCLUDE(CheckFunctionExists) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-05-02 16:44:46
|
Revision: 1281 http://freeglut.svn.sourceforge.net/freeglut/?rev=1281&view=rev Author: beuc Date: 2012-05-02 16:44:40 +0000 (Wed, 02 May 2012) Log Message: ----------- CHECK_FUNCTION_EXISTS for sinf/cosf/sqrtf actually fails not because of missing math.h, but because of missing -lm. Fixed. Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-05-02 16:42:55 UTC (rev 1280) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-05-02 16:44:40 UTC (rev 1281) @@ -187,7 +187,10 @@ # lib m for math, not needed on windows IF (NOT WIN32) + # For compilation: LIST(APPEND LIBS m) + # For CHECK_FUNCTION_EXISTS: + LIST(APPEND CMAKE_REQUIRED_LIBRARIES m) ENDIF() IF(WIN32) @@ -262,26 +265,9 @@ ENDIF() # Check for sinf/cosf/sqrtf -# CHECK_FUNCTION_EXISTS doesn't work because check requires <math.h> -#CHECK_FUNCTION_EXISTS(sinf HAVE_SINF) -#CHECK_FUNCTION_EXISTS(cosf HAVE_COSF) -#CHECK_FUNCTION_EXISTS(sqrtf HAVE_SQRTF) -INCLUDE(CheckCSourceCompiles) -CHECK_C_SOURCE_COMPILES(" - #include <math.h> - int main(){sinf(0); return 0;} - " HAVE_SINF -) -CHECK_C_SOURCE_COMPILES(" - #include <math.h> - int main(){cosf(0); return 0;} - " HAVE_COSF -) -CHECK_C_SOURCE_COMPILES(" - #include <math.h> - int main(){sqrtf(0); return 0;} - " HAVE_SQRTF -) +CHECK_FUNCTION_EXISTS(sinf HAVE_SINF) +CHECK_FUNCTION_EXISTS(cosf HAVE_COSF) +CHECK_FUNCTION_EXISTS(sqrtf HAVE_SQRTF) # The generated config.h is placed in the project's build directory, just to # ensure that all CMake-generated files are kept away from the main source tree. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-05-29 18:33:31
|
Revision: 1325 http://freeglut.svn.sourceforge.net/freeglut/?rev=1325&view=rev Author: beuc Date: 2012-05-29 18:33:22 +0000 (Tue, 29 May 2012) Log Message: ----------- Clarify why check for XInput Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2012-05-29 18:32:51 UTC (rev 1324) +++ trunk/freeglut/freeglut/CMakeLists.txt 2012-05-29 18:33:22 UTC (rev 1325) @@ -228,6 +228,7 @@ LIST(APPEND LIBS ${X11_Xxf86vm_LIB}) ENDIF() IF(X11_Xinput_FOUND) + # Needed for multi-touch: CHECK_INCLUDE_FILES("${X11_Xinput_INCLUDE_PATH}/X11/extensions/XInput2.h" HAVE_X11_EXTENSIONS_XINPUT2_H) LIST(APPEND LIBS ${X11_Xinput_LIB}) ENDIF() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dc...@us...> - 2013-04-05 02:55:52
|
Revision: 1591 http://freeglut.svn.sourceforge.net/freeglut/?rev=1591&view=rev Author: dcnieho Date: 2013-04-05 02:55:45 +0000 (Fri, 05 Apr 2013) Log Message: ----------- forgot to add teapot to sourcelist for gles1 and gles2 builds Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2013-04-05 02:14:17 UTC (rev 1590) +++ trunk/freeglut/freeglut/CMakeLists.txt 2013-04-05 02:55:45 UTC (rev 1591) @@ -59,6 +59,7 @@ src/fg_ext.c src/fg_font_data.c src/fg_gamemode.c + src/fg_geometry.c src/fg_gl2.c src/fg_gl2.h src/fg_init.c @@ -74,6 +75,8 @@ src/fg_stroke_mono_roman.c src/fg_stroke_roman.c src/fg_structure.c + src/fg_teapot.c + src/fg_teapot_data.h src/fg_videoresize.c src/fg_window.c ) @@ -82,13 +85,9 @@ LIST(APPEND FREEGLUT_SRCS src/fg_font.c src/fg_menu.c - src/fg_teapot.c - src/fg_teapot_data.h - src/fg_geometry.c ) ELSE() LIST(APPEND FREEGLUT_SRCS - src/fg_geometry.c src/gles_stubs.c ) ENDIF() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jt...@us...> - 2014-05-14 18:28:58
|
Revision: 1681 http://sourceforge.net/p/freeglut/code/1681 Author: jtsiomb Date: 2014-05-14 18:28:53 +0000 (Wed, 14 May 2014) Log Message: ----------- Compiling with -ansi makes a lot of important POSIX (standard UNIX) facilities unavailable. This was masked until recently by an incorrect conditional in the CMakeLists.txt file, that looked like it would use -ansi on anything other than android, but it didn't actually use it anywhere. As soon as that was fixed, and -ansi started being used, build broke on linux. The intention of the -ansi flag was to help catch portability-reducing mistakes in the code, so instead of removing it completely I used -pedantic in its place, which produces a lot of warnings for not strictly ISO/ANSI compliant code that relies on compiler-specific features. Modified Paths: -------------- trunk/freeglut/freeglut/CMakeLists.txt Modified: trunk/freeglut/freeglut/CMakeLists.txt =================================================================== --- trunk/freeglut/freeglut/CMakeLists.txt 2014-04-11 13:41:49 UTC (rev 1680) +++ trunk/freeglut/freeglut/CMakeLists.txt 2014-05-14 18:28:53 UTC (rev 1681) @@ -238,7 +238,7 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") IF(NOT(ANDROID OR BLACKBERRY)) # not setting -ansi as EGL/KHR headers doesn't support it - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ansi") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic") ENDIF() ENDIF(CMAKE_COMPILER_IS_GNUCC) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |