Merged changes in the trunk up to revision 41225.
[blender-staging.git] / source / creator / CMakeLists.txt
index f598c49292c5fcc65eadfc8be9693af3c8e28a11..ae69a71ebf1815d913d6126037b3c566ae92f1e9 100644 (file)
@@ -89,8 +89,8 @@ if(WITH_GAMEENGINE)
        add_definitions(-DWITH_GAMEENGINE)
 endif()
 
-if(NOT WITH_SDL)
-       add_definitions(-DDISABLE_SDL)
+if(WITH_SDL)
+       add_definitions(-DWITH_SDL)
 endif()
 
 if(WITH_BINRELOC)
@@ -345,16 +345,11 @@ if(UNIX AND NOT APPLE)
                )
        endif()
 
-       install(
-               FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf
-               DESTINATION ${TARGETDIR_VER}
-       )
-
        if(WITH_INTERNATIONAL)
                install(
                        DIRECTORY
-                               ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
-                               ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts
+                               ${CMAKE_SOURCE_DIR}/release/datafiles/locale
+                               ${CMAKE_SOURCE_DIR}/release/datafiles/fonts
                        DESTINATION ${TARGETDIR_VER}/datafiles
                        PATTERN ".svn" EXCLUDE
                )
@@ -417,16 +412,11 @@ elseif(WIN32)
                DESTINATION ${TARGETDIR}
        )
 
-       install(  # same as linux!, deduplicate
-               FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf
-               DESTINATION ${TARGETDIR_VER}
-       )
-
        if(WITH_INTERNATIONAL) # same as linux!, deduplicate
                install(
                        DIRECTORY
-                               ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
-                               ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts
+                               ${CMAKE_SOURCE_DIR}/release/datafiles/locale
+                               ${CMAKE_SOURCE_DIR}/release/datafiles/fonts
                        DESTINATION ${TARGETDIR_VER}/datafiles
                        PATTERN ".svn" EXCLUDE
                )
@@ -640,17 +630,12 @@ elseif(APPLE)
                \${TARGETDIR}/blender.app/Contents/
        )
 
-       install(
-               FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf
-               DESTINATION ${TARGETDIR_VER}
-       )
-
        # localization
        if(WITH_INTERNATIONAL)
                install(
                        DIRECTORY
-                               ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
-                               ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts
+                               ${CMAKE_SOURCE_DIR}/release/datafiles/locale
+                               ${CMAKE_SOURCE_DIR}/release/datafiles/fonts
                        DESTINATION ${TARGETDIR_VER}/datafiles
                        PATTERN ".svn" EXCLUDE
                )