Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 555 for code/branches/FICN/src


Ignore:
Timestamp:
Dec 17, 2007, 2:05:20 AM (17 years ago)
Author:
landauf
Message:

WIN32 hack in CLs

Location:
code/branches/FICN/src
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • code/branches/FICN/src/loader/CMakeLists.txt

    r480 r555  
    66)
    77
    8 ADD_LIBRARY(loader SHARED ${LOADER_SRC_FILES})
     8IF(WIN32)
     9  ADD_LIBRARY(loader ${LOADER_SRC_FILES})
     10ELSE(WIN32)
     11  ADD_LIBRARY(loader SHARED ${LOADER_SRC_FILES})
     12ENDIF(WIN32)
    913
    1014TARGET_LINK_LIBRARIES( loader
  • code/branches/FICN/src/network/CMakeLists.txt

    r539 r555  
    3434)
    3535
    36 ADD_LIBRARY(network SHARED ${NETWORK_SRC_FILES})
     36IF(WIN32)
     37  ADD_LIBRARY(network ${NETWORK_SRC_FILES})
     38ELSE(WIN32)
     39  ADD_LIBRARY(network SHARED ${NETWORK_SRC_FILES})
     40ENDIF(WIN32)
     41
    3742TARGET_LINK_LIBRARIES(network ${ZLIB_LIBRARY} ${ENet_LIBRARY} ${Boost_thread_LIBRARIES})
    3843
  • code/branches/FICN/src/orxonox/CMakeLists.txt

    r548 r555  
    3434    objects/Camera.cc
    3535    objects/SpaceshipSteeringObject.cc
     36    objects/Model.cc
    3637  )
    3738ELSE(WIN32)
     
    3940ENDIF(WIN32)
    4041
    41 ADD_LIBRARY(orxonox SHARED ${ORXONOX_SRC_FILES})
     42IF(WIN32)
     43  ADD_LIBRARY(orxonox ${ORXONOX_SRC_FILES})
     44ELSE(WIN32)
     45  ADD_LIBRARY(orxonox SHARED ${ORXONOX_SRC_FILES})
     46ENDIF(WIN32)
    4247
    4348ADD_EXECUTABLE(../../bin/main ${ORXONOX_SRC_FILES} ${OBJECTS_SRC_FILES})
  • code/branches/FICN/src/orxonox/core/CMakeLists.txt

    r542 r555  
    1313)
    1414
    15 ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
     15IF(WIN32)
     16  ADD_LIBRARY(core ${CORE_SRC_FILES})
     17ELSE(WIN32)
     18  ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
     19ENDIF(WIN32)
  • code/branches/FICN/src/orxonox/hud/CMakeLists.txt

    r376 r555  
    66)
    77
    8 ADD_LIBRARY(hud SHARED ${HUD_SRC_FILES})
     8IF(WIN32)
     9  ADD_LIBRARY(hud ${HUD_SRC_FILES})
     10ELSE(WIN32)
     11  ADD_LIBRARY(hud SHARED ${HUD_SRC_FILES})
     12ENDIF(WIN32)
  • code/branches/FICN/src/orxonox/objects/CMakeLists.txt

    r547 r555  
    1313  Camera.cc
    1414  SpaceshipSteeringObject.cc
     15  Model.cc
    1516)
    1617
  • code/branches/FICN/src/orxonox/particle/CMakeLists.txt

    r535 r555  
    55)
    66
    7 ADD_LIBRARY(particle SHARED ${SRC_FILES})
     7IF(WIN32)
     8  ADD_LIBRARY(particle ${SRC_FILES})
     9ELSE(WIN32)
     10  ADD_LIBRARY(particle SHARED ${SRC_FILES})
     11ENDIF(WIN32)
  • code/branches/FICN/src/orxonox/weapon/CMakeLists.txt

    r376 r555  
    1010)
    1111
    12 ADD_LIBRARY(weapon SHARED ${WEAPON_SRC_FILES})
     12IF(WIN32)
     13  ADD_LIBRARY(weapon ${WEAPON_SRC_FILES})
     14ELSE(WIN32)
     15  ADD_LIBRARY(weapon SHARED ${WEAPON_SRC_FILES})
     16ENDIF(WIN32)
  • code/branches/FICN/src/tinyxml/CMakeLists.txt

    r486 r555  
    44
    55SET (SRC_FILES
    6 tinystr.cc
    7 tinyxml.cc
    8 tinyxmlerror.cc
    9 tinyxmlparser
     6  tinystr.cc
     7  tinyxml.cc
     8  tinyxmlerror.cc
     9  tinyxmlparser
    1010)
    1111
    12 ADD_LIBRARY(xml SHARED ${SRC_FILES})
     12IF(WIN32)
     13  ADD_LIBRARY(xml ${SRC_FILES})
     14ELSE(WIN32)
     15  ADD_LIBRARY(xml SHARED ${SRC_FILES})
     16ENDIF(WIN32)
     17
Note: See TracChangeset for help on using the changeset viewer.