From 4f91132e28a4e616d887438013ae6855041adc9e Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Fri, 19 Jun 2020 22:09:13 +0800
Subject: [PATCH] add DevIL path to All projects

---
 CMAudio        | 2 +-
 CMSceneGraph   | 2 +-
 CMakeLists.txt | 9 ++++++++-
 MeshConv       | 2 +-
 TexConv        | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CMAudio b/CMAudio
index 9bc508f..01b01a2 160000
--- a/CMAudio
+++ b/CMAudio
@@ -1 +1 @@
-Subproject commit 9bc508f0a7e9f4ab2a48bbc9c3f445e663261c4d
+Subproject commit 01b01a23434cc5c500efb3db3acd3543226d608d
diff --git a/CMSceneGraph b/CMSceneGraph
index bf7152a..7c4583f 160000
--- a/CMSceneGraph
+++ b/CMSceneGraph
@@ -1 +1 @@
-Subproject commit bf7152aee5cffa219c6675c03d1e075b9c98c3bf
+Subproject commit 7c4583fa5b670c67f45d457f3ea2696a29f3819f
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e264ce..54a8f79 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.0)
 SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
 
 project(CMGameEngine)
@@ -30,6 +30,13 @@ if(CM_BUILD_TOOLS)
         include(QtCommon)
     ENDIF()
 
+if(WIN32)
+    include_directories("TexConv/DevIL Windows SDK/include")
+    link_directories("TexConv/DevIL Windows SDK/lib/x64/unicode/Release")
+endif(WIN32)
+
+    set(TEX_CONV_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/TexConv)
+
     add_subdirectory(TexConv)
     add_subdirectory(ShaderMaker)
     add_subdirectory(MeshConv)
diff --git a/MeshConv b/MeshConv
index 06d441c..7dd0972 160000
--- a/MeshConv
+++ b/MeshConv
@@ -1 +1 @@
-Subproject commit 06d441c66c1df9cb0938233f606c2c236f667de6
+Subproject commit 7dd097261f60bd49ce7d3c3cf05efc2560b2fdd0
diff --git a/TexConv b/TexConv
index c668228..a1977d3 160000
--- a/TexConv
+++ b/TexConv
@@ -1 +1 @@
-Subproject commit c668228d11668d990a6bd16e5cc54772d53b836c
+Subproject commit a1977d372f829a366f0c1423b9c112e6f2b926c6