FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

using FREE_GLUT_BUILD_STATIC_LIBS and FREEGLUT_BUILD_SHARED_LIBS instead of their unprefixed counterparts to avoid these defs leaking into build settings for other projects.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1576 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2013-04-04 01:29:17 +00:00
parent dde06cbe5c
commit 52bd423f58
2 changed files with 13 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
freeglut/freeglut/CMakeLists.txt
View File

@ -19,11 +19,11 @@ set(VERSION_MINOR 0)
set(VERSION_PATCH 0) set(VERSION_PATCH 0)
# BUILD_SHARED_LIBS is already a standard CMake variable, but we need to # FREEGLUT_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. # re-declare it here so it will show up in the GUI.
# by default, we want to build both # by default, we want to build both
OPTION(BUILD_SHARED_LIBS "Build FreeGLUT shared library." ON) OPTION(FREEGLUT_BUILD_SHARED_LIBS "Build FreeGLUT shared library." ON)
OPTION(BUILD_STATIC_LIBS "Build FreeGLUT static library." ON) OPTION(FREEGLUT_BUILD_STATIC_LIBS "Build FreeGLUT static library." ON)
# option for whether warnings and errors should be printed # option for whether warnings and errors should be printed
OPTION(FREEGLUT_ERRORS "Lib prints errors to stderr" ON) OPTION(FREEGLUT_ERRORS "Lib prints errors to stderr" ON)
@ -305,20 +305,20 @@ IF(WIN32)
ENDIF() ENDIF()
ENDIF() ENDIF()
IF(BUILD_SHARED_LIBS) IF(FREEGLUT_BUILD_SHARED_LIBS)
ADD_LIBRARY(freeglut SHARED ${FREEGLUT_SRCS}) ADD_LIBRARY(freeglut SHARED ${FREEGLUT_SRCS})
ENDIF() ENDIF()
IF(BUILD_STATIC_LIBS) IF(FREEGLUT_BUILD_STATIC_LIBS)
ADD_LIBRARY(freeglut_static STATIC ${FREEGLUT_SRCS}) ADD_LIBRARY(freeglut_static STATIC ${FREEGLUT_SRCS})
ENDIF() ENDIF()
IF(WIN32) IF(WIN32)
LIST(APPEND LIBS winmm) LIST(APPEND LIBS winmm)
IF(BUILD_SHARED_LIBS) IF(FREEGLUT_BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS) SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS)
ENDIF() ENDIF()
IF(BUILD_STATIC_LIBS) IF(FREEGLUT_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 # need to set machine:x64 for linker, at least for VC10, and
# doesn't hurt for older compilers: # doesn't hurt for older compilers:
@ -364,14 +364,14 @@ ELSE()
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -gstabs+") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -gstabs+")
ENDIF() ENDIF()
ENDIF() ENDIF()
IF(BUILD_SHARED_LIBS) IF(FREEGLUT_BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(freeglut ${LIBS}) TARGET_LINK_LIBRARIES(freeglut ${LIBS})
ENDIF() ENDIF()
IF(BUILD_STATIC_LIBS) IF(FREEGLUT_BUILD_STATIC_LIBS)
TARGET_LINK_LIBRARIES(freeglut_static ${LIBS}) TARGET_LINK_LIBRARIES(freeglut_static ${LIBS})
ENDIF() ENDIF()
IF(BUILD_SHARED_LIBS) IF(FREEGLUT_BUILD_SHARED_LIBS)
INSTALL(TARGETS freeglut INSTALL(TARGETS freeglut
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION lib
@ -383,7 +383,7 @@ IF(BUILD_SHARED_LIBS)
CONFIGURATIONS Debug) CONFIGURATIONS Debug)
ENDIF() ENDIF()
ENDIF() ENDIF()
IF(BUILD_STATIC_LIBS) IF(FREEGLUT_BUILD_STATIC_LIBS)
INSTALL(TARGETS freeglut_static INSTALL(TARGETS freeglut_static
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION lib
@ -410,14 +410,14 @@ ENDIF()
MACRO(ADD_DEMO name) MACRO(ADD_DEMO name)
IF( FREEGLUT_BUILD_DEMOS ) IF( FREEGLUT_BUILD_DEMOS )
IF(BUILD_SHARED_LIBS) IF(FREEGLUT_BUILD_SHARED_LIBS)
ADD_EXECUTABLE(${name} ${ARGN}) ADD_EXECUTABLE(${name} ${ARGN})
TARGET_LINK_LIBRARIES(${name} ${DEMO_LIBS} freeglut) TARGET_LINK_LIBRARIES(${name} ${DEMO_LIBS} freeglut)
IF(WIN32 AND MSVC) IF(WIN32 AND MSVC)
SET_TARGET_PROPERTIES(${name} PROPERTIES DEBUG_POSTFIX d) SET_TARGET_PROPERTIES(${name} PROPERTIES DEBUG_POSTFIX d)
ENDIF() ENDIF()
ENDIF() ENDIF()
IF(BUILD_STATIC_LIBS) IF(FREEGLUT_BUILD_STATIC_LIBS)
ADD_EXECUTABLE(${name}_static ${ARGN}) ADD_EXECUTABLE(${name}_static ${ARGN})
TARGET_LINK_LIBRARIES(${name}_static ${DEMO_LIBS} freeglut_static) TARGET_LINK_LIBRARIES(${name}_static ${DEMO_LIBS} freeglut_static)
SET_TARGET_PROPERTIES(${name}_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC) SET_TARGET_PROPERTIES(${name}_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC)

34
freeglut/freeglut/src/fg_main.h
View File

@ -1,34 +0,0 @@
/*
* fg_main.h
*
* The windows message processing methods.
*
* Copyright (C) 2012 Sylvain Beucler
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef __FG_MAIN_H__
#define __FG_MAIN_H__
#include <GL/freeglut.h>
#include "fg_internal.h"
extern void fghRedrawWindow(SFG_Window *window);
#endif