mirror of
https://github.com/etlegacy/etlegacy-libs.git
synced 2025-04-08 15:40:52 +00:00
compile 3rd party libs from source on Windows again
This commit is contained in:
Radegast
parent
e1aeb4c840
commit
1b8c2200ef
1 changed files with 67 additions and 21 deletions
|
|
@ -3,19 +3,63 @@ if(WIN32)
|
|||
# Build bundled JPEG library
|
||||
#-----------------------------------------------------------------
|
||||
if(BUNDLED_JPEG) # static
|
||||
# add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/jpeg/libjpeg.lib
|
||||
# COMMAND NMAKE /f makefile.vc setup-v10 && NMAKE /C /f makefile.vc
|
||||
# WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/jpeg
|
||||
# )
|
||||
# add_custom_target(bundled_jpeg
|
||||
# DEPENDS ${CMAKE_SOURCE_DIR}/libs/jpeg/libjpeg.lib
|
||||
# )
|
||||
# set(JPEG_BUNDLED_LIBRARIES "${CMAKE_SOURCE_DIR}/libs/jpeg/libjpeg.lib" PARENT_SCOPE)
|
||||
# create a backup of jconfig.h needed for reruns of libjpeg`s makefile
|
||||
# message(STATUS "Backing up jpeg build files.")
|
||||
# file(REMOVE "${CMAKE_SOURCE_DIR}/libs/jpeg/jconfig.h"
|
||||
# "${CMAKE_SOURCE_DIR}/libs/jpeg/jpeg.sln"
|
||||
# "${CMAKE_SOURCE_DIR}/libs/jpeg/apps.sln"
|
||||
# "${CMAKE_SOURCE_DIR}/libs/jpeg/jpeg.vcxproj"
|
||||
# "${CMAKE_SOURCE_DIR}/libs/jpeg/jpeg.vcxproj.filters"
|
||||
# "${CMAKE_SOURCE_DIR}/libs/jpeg/cjpeg.vcxproj"
|
||||
# "${CMAKE_SOURCE_DIR}/libs/jpeg/cjpeg.vcxproj.filters"
|
||||
# "${CMAKE_SOURCE_DIR}/libs/jpeg/djpeg.vcxproj"
|
||||
# "${CMAKE_SOURCE_DIR}/libs/jpeg/djpeg.vcxproj.filters"
|
||||
# "${CMAKE_SOURCE_DIR}/libs/jpeg/jpegtran.vcxproj"
|
||||
# "${CMAKE_SOURCE_DIR}/libs/jpeg/jpegtran.vcxproj.filters"
|
||||
# "${CMAKE_SOURCE_DIR}/libs/jpeg/rdjpgcom.vcxproj"
|
||||
# "${CMAKE_SOURCE_DIR}/libs/jpeg/rdjpgcom.vcxproj.filters"
|
||||
# "${CMAKE_SOURCE_DIR}/libs/jpeg/wrjpgcom.vcxproj"
|
||||
# "${CMAKE_SOURCE_DIR}/libs/jpeg/wrjpgcom.vcxproj.filters")
|
||||
# file(COPY "${CMAKE_SOURCE_DIR}/libs/jpeg/jconfig.vc" DESTINATION ${CMAKE_BINARY_DIR})
|
||||
# file(COPY "${CMAKE_SOURCE_DIR}/libs/jpeg/makejsln.v10" DESTINATION ${CMAKE_BINARY_DIR})
|
||||
# file(COPY "${CMAKE_SOURCE_DIR}/libs/jpeg/makeasln.v10" DESTINATION ${CMAKE_BINARY_DIR})
|
||||
# file(COPY "${CMAKE_SOURCE_DIR}/libs/jpeg/makejvcx.v10" DESTINATION ${CMAKE_BINARY_DIR})
|
||||
# file(COPY "${CMAKE_SOURCE_DIR}/libs/jpeg/makejfil.v10" DESTINATION ${CMAKE_BINARY_DIR})
|
||||
# file(COPY "${CMAKE_SOURCE_DIR}/libs/jpeg/makecvcx.v10" DESTINATION ${CMAKE_BINARY_DIR})
|
||||
# file(COPY "${CMAKE_SOURCE_DIR}/libs/jpeg/makecfil.v10" DESTINATION ${CMAKE_BINARY_DIR})
|
||||
# file(COPY "${CMAKE_SOURCE_DIR}/libs/jpeg/makedvcx.v10" DESTINATION ${CMAKE_BINARY_DIR})
|
||||
# file(COPY "${CMAKE_SOURCE_DIR}/libs/jpeg/maketvcx.v10" DESTINATION ${CMAKE_BINARY_DIR})
|
||||
# file(COPY "${CMAKE_SOURCE_DIR}/libs/jpeg/makervcx.v10" DESTINATION ${CMAKE_BINARY_DIR})
|
||||
# file(COPY "${CMAKE_SOURCE_DIR}/libs/jpeg/makewvcx.v10" DESTINATION ${CMAKE_BINARY_DIR})
|
||||
|
||||
file(COPY "${CMAKE_SOURCE_DIR}/libs/jpeg/jconfig.vc" DESTINATION ${CMAKE_BINARY_DIR}/include)
|
||||
file(RENAME ${CMAKE_BINARY_DIR}/include/jconfig.vc ${CMAKE_BINARY_DIR}/include/jconfig.h)
|
||||
add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/jpeg/libjpeg.lib
|
||||
COMMAND NMAKE /f makefile.vc setup-v10 && NMAKE /C /f makefile.vc
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/jpeg
|
||||
)
|
||||
|
||||
# message(STATUS "Restoring jpeg build files.")
|
||||
# file(COPY "${CMAKE_BINARY_DIR}/jconfig.vc" DESTINATION ${CMAKE_SOURCE_DIR}/libs/jpeg/)
|
||||
# file(COPY "${CMAKE_BINARY_DIR}/makejsln.v10" DESTINATION ${CMAKE_SOURCE_DIR}/libs/jpeg/)
|
||||
# file(COPY "${CMAKE_BINARY_DIR}/makeasln.v10" DESTINATION ${CMAKE_SOURCE_DIR}/libs/jpeg/)
|
||||
# file(COPY "${CMAKE_BINARY_DIR}/makejvcx.v10" DESTINATION ${CMAKE_SOURCE_DIR}/libs/jpeg/)
|
||||
# file(COPY "${CMAKE_BINARY_DIR}/makejfil.v10" DESTINATION ${CMAKE_SOURCE_DIR}/libs/jpeg/)
|
||||
# file(COPY "${CMAKE_BINARY_DIR}/makecvcx.v10" DESTINATION ${CMAKE_SOURCE_DIR}/libs/jpeg/)
|
||||
# file(COPY "${CMAKE_BINARY_DIR}/makecfil.v10" DESTINATION ${CMAKE_SOURCE_DIR}/libs/jpeg/)
|
||||
# file(COPY "${CMAKE_BINARY_DIR}/makedvcx.v10" DESTINATION ${CMAKE_SOURCE_DIR}/libs/jpeg/)
|
||||
# file(COPY "${CMAKE_BINARY_DIR}/maketvcx.v10" DESTINATION ${CMAKE_SOURCE_DIR}/libs/jpeg/)
|
||||
# file(COPY "${CMAKE_BINARY_DIR}/makervcx.v10" DESTINATION ${CMAKE_SOURCE_DIR}/libs/jpeg/)
|
||||
# file(COPY "${CMAKE_BINARY_DIR}/makewvcx.v10" DESTINATION ${CMAKE_SOURCE_DIR}/libs/jpeg/)
|
||||
|
||||
add_custom_target(bundled_jpeg
|
||||
DEPENDS ${CMAKE_SOURCE_DIR}/libs/jpeg/libjpeg.lib
|
||||
)
|
||||
|
||||
#file(COPY "${CMAKE_SOURCE_DIR}/libs/jpeg/jconfig.vc" DESTINATION ${CMAKE_BINARY_DIR}/include)
|
||||
#file(RENAME ${CMAKE_BINARY_DIR}/include/jconfig.vc ${CMAKE_BINARY_DIR}/include/jconfig.h)
|
||||
|
||||
set(JPEG_BUNDLED_LIBRARIES "${CMAKE_SOURCE_DIR}/libs/jpeg-windows/jpeg.lib" PARENT_SCOPE)
|
||||
#set(JPEG_BUNDLED_LIBRARIES "${CMAKE_SOURCE_DIR}/libs/jpeg-windows/jpeg.lib" PARENT_SCOPE)
|
||||
|
||||
set(JPEG_BUNDLED_LIBRARIES "${CMAKE_SOURCE_DIR}/libs/jpeg/libjpeg.lib" PARENT_SCOPE)
|
||||
set(JPEG_BUNDLED_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/libs/jpeg" PARENT_SCOPE)
|
||||
endif(BUNDLED_JPEG)
|
||||
|
||||
|
|
@ -23,16 +67,18 @@ if(WIN32)
|
|||
# Build bundled cURL library
|
||||
#-----------------------------------------------------------------
|
||||
if(BUNDLED_CURL) # DLL
|
||||
# add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/curl/lib/release-dll/libcurl_imp.lib
|
||||
# COMMAND NMAKE /C /f Makefile vc-dll VC=vc10
|
||||
# COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/libs/curl/lib/release-dll/libcurl.dll ${CMAKE_BINARY_DIR}
|
||||
# WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/curl
|
||||
# )
|
||||
# add_custom_target(bundled_curl
|
||||
# DEPENDS ${CMAKE_SOURCE_DIR}/libs/curl/lib/release-dll/libcurl_imp.lib
|
||||
# )
|
||||
# set(CURL_BUNDLED_LIBRARY "${CMAKE_SOURCE_DIR}/libs/curl/lib/release-dll/libcurl_imp.lib" PARENT_SCOPE)
|
||||
set(CURL_BUNDLED_LIBRARY "${CMAKE_SOURCE_DIR}/libs/curl-windows/libcurl.lib" PARENT_SCOPE)
|
||||
add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/curl/lib/release-dll/libcurl_imp.lib
|
||||
COMMAND NMAKE /C /f Makefile vc-dll VC=vc10
|
||||
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/libs/curl/lib/release-dll/libcurl.dll ${CMAKE_BINARY_DIR}
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/curl
|
||||
)
|
||||
add_custom_target(bundled_curl
|
||||
DEPENDS ${CMAKE_SOURCE_DIR}/libs/curl/lib/release-dll/libcurl_imp.lib
|
||||
)
|
||||
|
||||
#set(CURL_BUNDLED_LIBRARY "${CMAKE_SOURCE_DIR}/libs/curl-windows/libcurl.lib" PARENT_SCOPE)
|
||||
|
||||
set(CURL_BUNDLED_LIBRARY "${CMAKE_SOURCE_DIR}/libs/curl/lib/release-dll/libcurl_imp.lib" PARENT_SCOPE)
|
||||
set(CURL_BUNDLED_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/libs/curl/include" PARENT_SCOPE)
|
||||
endif(BUNDLED_CURL)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue