Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed the SFML_DYNAMIC symbol for dynamic builds, added SFML_STATIC for static builds

Browse Source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1614 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-11-05 13:58:29 +00:00
parent 7ed866667d
commit 6a6ff075e8
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -30,9 +30,9 @@ set(BUILD_EXAMPLES FALSE CACHE BOOL "TRUE to build the SFML examples, FALSE to i
# add an option for building the API documentation # add an option for building the API documentation
set(BUILD_DOC FALSE CACHE BOOL "TRUE to generate the API documentation, FALSE to ignore it") set(BUILD_DOC FALSE CACHE BOOL "TRUE to generate the API documentation, FALSE to ignore it")
# define SFML_DYNAMIC if the build type is set to 'shared' # define SFML_STATIC if the build type is not set to 'shared'
if(BUILD_SHARED_LIBS) if(NOT BUILD_SHARED_LIBS)
add_definitions(-DSFML_DYNAMIC) add_definitions(-DSFML_STATIC)
endif() endif()
# remove SL security warnings with Visual C++ # remove SL security warnings with Visual C++

1
CSFML/include/SFML/Config.h
View File

@ -62,7 +62,6 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#if defined(CSFML_SYSTEM_WINDOWS) #if defined(CSFML_SYSTEM_WINDOWS)
// Windows platforms
#ifdef CSFML_EXPORTS #ifdef CSFML_EXPORTS
// From DLL side, we must export // From DLL side, we must export

1
CSFML/src/SFML/CMakeLists.txt
View File

@ -17,6 +17,7 @@ add_definitions(-DCSFML_EXPORTS)
# find SFML libraries (C++) # find SFML libraries (C++)
if(WINDOWS) if(WINDOWS)
set(SFML_STATIC_LIBRARIES TRUE) set(SFML_STATIC_LIBRARIES TRUE)
add_definitions(-DSFML_STATIC)
endif() endif()
find_package(SFML 2 COMPONENTS system window network graphics audio REQUIRED) find_package(SFML 2 COMPONENTS system window network graphics audio REQUIRED)
include_directories(${SFML_INCLUDE_DIR}) include_directories(${SFML_INCLUDE_DIR})

2
include/SFML/Config.hpp
View File

@ -95,7 +95,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#if defined(SFML_SYSTEM_WINDOWS) #if defined(SFML_SYSTEM_WINDOWS)
#ifdef SFML_DYNAMIC #ifndef SFML_STATIC
// Windows platforms // Windows platforms
#ifdef SFML_EXPORTS #ifdef SFML_EXPORTS