Changeset 152

Show
Ignore:
Timestamp:
02/20/10 16:26:58 (5 months ago)
Author:
reed
Message:

fixes for building on windows 7

Location:
current
Files:
1 removed
2 modified

Legend:

Unmodified
Added
Removed

  • current/Modules/NSIS.template.in

    r125 r152  
    2323;Vista Orange Theme 
    2424;Sets the theme path 
    25   !define OMUI_THEME_PATH "${NSISDIR}\Contrib\MUI Orange Vista Theme\Clean" 
     25  !define OMUI_THEME_PATH "${NSISDIR}\Contrib\MUIOrangeVistaTheme\Clean" 
    2626 
    2727; MUI Settings / Icons 

  • current/src/CMakeLists.txt

    r150 r152  
    66  "\"-DPACKAGE_STRING=\\\"${PROJ_NAME} ${PROJ_VERSION}\\\"\"" 
    77  "\"-DPACKAGE_BUGREPORT=\\\"${PROJ_EMAIL}\\\"\"" 
     8  "-DBOOST_ALL_NO_LIB" 
    89) 
    910 
    … …  
    2021  ADD_DEFINITIONS(-D_SCL_SECURE_NO_DEPRECATE) 
    2122  SET(CMAKE_C_FLAGS "${MY_C_FLAGS} /wd4100 /wd4101 /wd4189 /wd4706") 
    22   STRING(REGEX REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") 
    23   STRING(REGEX REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") 
    24   STRING(REGEX REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") 
    25   STRING(REGEX REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") 
     23  IF(USE_STATIC_LIBS) 
     24    STRING(REGEX REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") 
     25    STRING(REGEX REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") 
     26    STRING(REGEX REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") 
     27    STRING(REGEX REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") 
     28  ENDIF(USE_STATIC_LIBS) 
    2629   
    2730  # Use the highest warning level for visual studio. 
    … …  
    5053  LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) 
    5154  IF(NOT Boost_USE_STATIC_LIBS) 
    52     ADD_DEFINITIONS(-DBOOST_DYN_LINK) 
     55    ADD_DEFINITIONS(-DBOOST_ALL_DYN_LINK) 
    5356  ENDIF(NOT Boost_USE_STATIC_LIBS) 
    5457  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${Boost_LIB_DIAGNOSTIC_DEFINITIONS}")