Changeset 10268 for code/trunk
- Timestamp:
- Feb 12, 2015, 11:28:26 PM (10 years ago)
- Location:
- code/trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/cmake/tools/PrecompiledHeaderFiles.cmake
r10187 r10268 104 104 FOREACH(_file ${_source_files}) 105 105 GET_SOURCE_FILE_PROPERTY(_is_header ${_file} HEADER_FILE_ONLY) 106 IF(NOT _is_header) 106 # Don't use pch file for header-only files and *.rc files 107 IF((NOT _is_header) AND (NOT _file MATCHES "\\.rc$")) 107 108 GET_SOURCE_FILE_PROPERTY(_old_flags ${_file} COMPILE_FLAGS) 108 109 IF(NOT _old_flags) … … 113 114 OBJECT_DEPENDS "${_pch_header_file}" 114 115 ) 115 ENDIF( NOT _is_header)116 ENDIF() 116 117 ENDFOREACH(_file) 117 118 -
code/trunk/src/CMakeLists.txt
r10267 r10268 59 59 LIST(APPEND ORXONOX_MAIN_FILES OrxonoxMac.mm) 60 60 # Add the icon for win32 builds 61 # TODO: does this work for mingw too? 62 ELSEIF(WIN32 AND MSVC) 61 ELSEIF(WIN32) 63 62 LIST(APPEND ORXONOX_MAIN_FILES ${CMAKE_SOURCE_DIR}/contrib/winresource.rc) 64 63 ENDIF() -
code/trunk/src/libraries/core/CMakeLists.txt
r10267 r10268 69 69 70 70 #Add the icon (for the renderwindow) 71 IF(WIN32 AND MSVC)71 IF(WIN32) 72 72 List(APPEND CORE_SRC_FILES ${CMAKE_SOURCE_DIR}/contrib/winresource.rc) 73 73 ENDIF() -
code/trunk/src/libraries/core/GraphicsManager.cc
r10267 r10268 318 318 319 319 //Add program icon 320 #if defined(ORXONOX_PLATFORM_WINDOWS) && defined(_MSC_VER)320 #if defined(ORXONOX_PLATFORM_WINDOWS) 321 321 HWND hwnd; 322 322 this->renderWindow_->getCustomAttribute("WINDOW", (void*)&hwnd);
Note: See TracChangeset
for help on using the changeset viewer.