Skip to content

fixed out-of-source build; removed resource compilation for visual st… #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
malytomas wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed out-of-source build; removed resource compilation for visual st… #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DevIL/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)

project(ImageLib)
# include our custom modules
set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")

add_subdirectory(src-IL)
add_subdirectory(src-ILU)
Expand Down
21 changes: 14 additions & 7 deletions DevIL/src-IL/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,18 @@ if(WIN32)
add_definitions(-DIL_DLL -DJPEGSTATIC)
# note: .def not used for now - __declspec() in source handles export.
set(DevIL_SRCS ${DevIL_SRCS} msvc/il.def)
if(UNICODE)
set(DevIL_RSRC ${DevIL_RSRC} "msvc/resources/IL Logo.ico" "msvc/IL Unicode.rc")
else(UNICODE)
set(DevIL_RSRC ${DevIL_RSRC} "msvc/resources/IL Logo.ico" "msvc/IL.rc")
endif(UNICODE)
if(${MSVC_VERSION} GREATER 1899) # MSVC 2015 or later
option(DEVIL_INCLUDE_RESOURCES "DevIL: compile-in resources" OFF)
else()
option(DEVIL_INCLUDE_RESOURCES "DevIL: compile-in resources" ON)
endif()
if(DEVIL_INCLUDE_RESOURCES)
if(UNICODE)
set(DevIL_RSRC ${DevIL_RSRC} "msvc/resources/IL Logo.ico" "msvc/IL Unicode.rc")
else(UNICODE)
set(DevIL_RSRC ${DevIL_RSRC} "msvc/resources/IL Logo.ico" "msvc/IL.rc")
endif(UNICODE)
endif(DEVIL_INCLUDE_RESOURCES)
set(DevIL_TXT ${DevIL_TXT} ../AUTHORS ../ChangeLog ../CREDITS ../libraries.txt ../README.md ../README.cmake ../TODO)
# SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:msvcrt.lib ")
set(CMAKE_C_FLAGS_RELEASE "/MT /O2")
Expand Down Expand Up @@ -293,11 +300,11 @@ if(IL_USE_DXTC_SQUISH)
endif(IL_USE_DXTC_SQUISH)


include_directories(${incs})
include_directories(${incs} "${CMAKE_CURRENT_BINARY_DIR}/include")
target_link_libraries(IL ${libs})

# generate config.h
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake.in ${CMAKE_CURRENT_SOURCE_DIR}/include/config.h)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)



Expand Down