d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devil-patch' of https://github.com/ashdnazg/mxe into ashdnazg-devil-patch

This commit is contained in:
Tony Theodore 2018-02-17 16:34:59 +11:00
parent 36fb4762a1 f7df1b5bcb
commit 3f18c12822
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/devil-1-fixes.patch
View File

@ -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)