Changeset 217:20cbe0ad246d in verona


Ignore:
Timestamp:
May 30, 2011 5:37:30 PM (2 years ago)
Author:
laurent@…
Branch:
default
Message:

cutil include path shoul not be used with wince

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • .hgsubstate

    r216 r217  
    11a1bd05cf1becfa567d269e68ab312ed4154d4ab2 libs/hlibpp 
    2 52b7ad7575bd0115ba03fabf8c5b3fb30d625cf2 libs/miniini 
     23f2b30b324053c25ffc358ba5e5e77f6c395d494 libs/miniini 
    33d6e7191f6569742df0df30fe067a3b17e0380b07 libs/srtp 
    44eb39a86e3985369e8e316fa4c7780273b111d2be mediastreamer2 

  • build/build-vc9-winCE.bat

    r131 r217  
    11setlocal 
    22set PATH=C:\swig-1.3.36;%PATH% 
    3 hg purge --all 
     3 
    44cmake .. -G"Visual Studio 9 2008 for Windows CE" -DCMAKE_WINDOWS_CE_PLATFORM="Windows Mobile 6 Professional SDK (ARMV4I)"  -DUSE_CSL=1 
    55endlocal 

  • libeXosip2/CMakeLists.txt

    r212 r217  
    5555endif(USE_CSL) 
    5656 
    57 if(WIN32) 
     57find_file(STDINT_H_FILE "stdint.h") 
     58if(WIN32 AND NOT CMAKE_UNDER_CE) 
    5859  include_directories(include ${OSIP2_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/../libs/util/cutil/include/cutil/msvc) 
    59 else(WIN32) 
     60else(WIN32 AND NOT CMAKE_UNDER_CE) 
    6061  include_directories(include ${OSIP2_INCLUDE_DIRS}) 
    61 endif(WIN32) 
     62endif(WIN32 AND NOT CMAKE_UNDER_CE) 
    6263link_directories(${OSIP2_LIBRARY_DIRS}) 
    6364 

  • phapi/CMakeLists.txt

    r212 r217  
    124124endif(NOT OLD_MS_SUPPORT) 
    125125 
    126 if(WIN32) 
     126find_file(STDINT_H_FILE "stdint.h") 
     127if(WIN32 AND NOT CMAKE_UNDER_CE) 
    127128  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../libs/util/cutil/include/cutil/msvc) 
    128   set(PHAPI_LINK_LIBRARIES ${PHAPI_LINK_LIBRARIES} msdirent) 
    129 endif(WIN32) 
     129endif(WIN32 AND NOT CMAKE_UNDER_CE) 
     130 
    130131if(CMAKE_UNDER_CE) 
    131132  add_definitions( 

  • phtest/CMakeLists.txt

    r212 r217  
    77 
    88find_file(STDINT_H_FILE "stdint.h") 
    9  
    10 if(WIN32) 
     9if(WIN32 AND NOT CMAKE_UNDER_CE) 
    1110  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../libs/util/cutil/include/cutil/msvc) 
    12 endif(WIN32) 
     11endif(WIN32 AND NOT CMAKE_UNDER_CE) 
    1312 
    1413include_directories(../phapi ${OSIP2_INCLUDE_DIRS} ${MINIINI_INCLUDE_DIRS} ${PHAPIPP_INCLUDE_DIRS}) 
Note: See TracChangeset for help on using the changeset viewer.