- check IF WIN32 AND NOT UNIX (for cygwin)
[blender.git] / source / blenderplayer / CMakeLists.txt
index 566bc88e46dc2fdec14bb89a3bdc7b4f1c6dca49..d1aee8c9d160f389d728a724659ca2d3a503185d 100644 (file)
@@ -43,17 +43,17 @@ ADD_CUSTOM_COMMAND(
        DEPENDS ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna
 )
 
-IF(WIN32)
+IF(WIN32 AND NOT UNIX)
        ADD_EXECUTABLE(blenderplayer ${EXETYPE} ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc)
-ELSE(WIN32)
+ELSE(WIN32 AND NOT UNIX)
        ADD_EXECUTABLE(blenderplayer ${CMAKE_CURRENT_BINARY_DIR}/dna.c)
-ENDIF(WIN32)
+ENDIF(WIN32 AND NOT UNIX)
 
 ADD_DEPENDENCIES(blenderplayer makesdna)
 
 FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
 
-SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} gp_common gp_ghost blenkernel_blc)
+SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} ge_player_common ge_player_ghost blenkernel_blc)
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
        SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc)
@@ -62,57 +62,61 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 IF(UNIX)
        # Sort libraries
        SET(BLENDER_SORTED_LIBS
-               gp_ghost 
-               gp_common 
-               bf_string 
-               bf_ghost 
+               ge_player_ghost 
+               ge_player_common 
+               bf_intern_string 
+               bf_intern_ghost
                bf_rna
                bf_blenkernel
                bf_blenloader 
                bf_blenpluginapi 
-               bf_blroutines 
-               bf_converter 
-               bf_ketsji 
-               bf_bullet 
-               bf_common 
-               bf_dummy 
-               bf_logic 
-               bf_rasterizer 
-               bf_oglrasterizer 
-               bf_expressions 
-               bf_scenegraph
-               bf_ikplugin
-               bf_ITASC
-               bf_IK
-               bf_smoke
+               ge_blen_routines
+               bf_editor_datafiles
+               ge_converter 
+               ge_logic_ketsji 
+               ge_phys_bullet 
+               ge_phys_dummy
+               ge_phys_common 
+               ge_logic 
+               ge_rasterizer 
+               ge_oglrasterizer 
+               ge_logic_expressions 
+               ge_scenegraph
+               bf_ikplugin
+               bf_intern_itasc
+               bf_intern_ik
+               bf_intern_smoke
                bf_modifiers
-               bf_moto 
-               bf_kernel 
+               bf_intern_moto 
+               bf_gen_system 
                bf_nodes
                bf_gpu
                bf_imbuf
                bf_avi 
-               kx_network 
-               bf_ngnetwork 
-               bf_loopbacknetwork 
+               ge_logic_network 
+               ge_logic_ngnetwork 
+               ge_logic_loopbacknetwork 
                extern_bullet 
-               bf_guardedalloc 
-               bf_memutil 
+               bf_intern_guardedalloc 
+               bf_intern_memutil 
                bf_python
-               bf_gen_python
+               bf_python_ext
                bf_blenlib 
-               bf_cineon
-               bf_openexr 
-               extern_libopenjpeg 
-               bf_dds
+               bf_imbuf_cineon
+               bf_imbuf_openexr 
+               extern_openjpeg 
+               bf_imbuf_dds
                bf_readblenfile 
                bf_dna
-               bf_videotex
+               ge_videotex
                bf_blenfont
-               bf_audaspace
+               bf_intern_audaspace
                blenkernel_blc
                extern_binreloc
                extern_glew
+               extern_minilzo
+               bf_intern_ghost # duplicate for linking
+               bf_blenkernel # duplicate for linking
        )
   
        IF(WITH_QUICKTIME)
@@ -120,7 +124,7 @@ IF(UNIX)
        ENDIF(WITH_QUICKTIME)
 
        IF(WITH_CXX_GUARDEDALLOC)
-               SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
+               SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_intern_guardedalloc_cpp)
        ENDIF(WITH_CXX_GUARDEDALLOC)
 
        FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})