diff options
| author | Eshed <ashdnazg@gmail.com> | 2018-01-21 20:25:40 (GMT) |
|---|---|---|
| committer | Eshed <ashdnazg@gmail.com> | 2018-01-21 20:25:40 (GMT) |
| commit | f7df1b5bcb4e671e52a44cb30563814e03dbb368 (patch) | |
| tree | 05cb74d19c49cb61a00b4533c10e1b11b0a95ff5 | |
| parent | dc40c71587992187765b3b9fe94ce9d56da3808c (diff) | |
| download | mxe-f7df1b5bcb4e671e52a44cb30563814e03dbb368.zip mxe-f7df1b5bcb4e671e52a44cb30563814e03dbb368.tar.gz mxe-f7df1b5bcb4e671e52a44cb30563814e03dbb368.tar.bz2 | |
Fix devil shared lib compilation
| -rw-r--r-- | src/devil-1-fixes.patch | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/src/devil-1-fixes.patch b/src/devil-1-fixes.patch index dbf68ed..33a5d06 100644 --- a/src/devil-1-fixes.patch +++ b/src/devil-1-fixes.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Christian Weigel <christian.weigel@idmt.fraunhofer.de> Date: Fri, 17 Feb 2017 10:07:48 +0100 -Subject: [PATCH 1/2] fix static build of ilu and ilut +Subject: [PATCH 1/3] fix static build of ilu and ilut taken from https://github.com/DentonW/DevIL/pull/59 @@ -55,7 +55,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Thu, 20 Jul 2017 16:34:51 +1000 -Subject: [PATCH 2/2] fix resource paths +Subject: [PATCH 2/3] fix resource paths DevIL/src-IL/msvc/IL.rc has weird EOL issues and patches don't apply - use $(SED) in build rule instead @@ -86,3 +86,23 @@ index 1111111..2222222 100644 ///////////////////////////////////////////////////////////////////////////// // + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Eshed <ashdnazg@gmail.com> +Date: Sun, 21 Jan 2018 22:07:18 +0200 +Subject: [PATCH 3/3] Fix case + + +diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt +index 1111111..2222222 100644 +--- a/DevIL/src-IL/CMakeLists.txt ++++ b/DevIL/src-IL/CMakeLists.txt +@@ -41,7 +41,7 @@ if(WIN32) + else(UNICODE) + set(DevIL_RSRC ${DevIL_RSRC} "msvc/resources/IL Logo.ico" "msvc/IL.rc") + endif(UNICODE) +- set(DevIL_TXT ${DevIL_TXT} ../AUTHORS ../ChangeLog ../CREDITS ../libraries.txt ../README.md ../README.cmake ../TODO) ++ 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") + else(BUILD_SHARED_LIBS) |