From 1e07b263563f3aa6a0a48c7e9760c8a36506d5eb Mon Sep 17 00:00:00 2001 From: nakeee Date: Fri, 8 May 2009 09:31:57 +0000 Subject: [PATCH] Move soil to external, this breaks windows build until deathroi will commit the windows part git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3175 8ced0084-cf51-0410-be5f-012b33b47a6e --- {Source/Core/VideoCommon/Src => Externals}/SOIL/SOIL.c | 0 {Source/Core/VideoCommon/Src => Externals}/SOIL/SOIL.h | 0 {Source/Core/VideoCommon/Src => Externals}/SOIL/image_DXT.c | 0 {Source/Core/VideoCommon/Src => Externals}/SOIL/image_DXT.h | 0 .../Core/VideoCommon/Src => Externals}/SOIL/image_helper.c | 0 .../Core/VideoCommon/Src => Externals}/SOIL/image_helper.h | 0 .../Core/VideoCommon/Src => Externals}/SOIL/stb_image_aug.c | 0 .../Core/VideoCommon/Src => Externals}/SOIL/stb_image_aug.h | 0 .../Core/VideoCommon/Src => Externals}/SOIL/stbi_DDS_aug.h | 0 .../Core/VideoCommon/Src => Externals}/SOIL/stbi_DDS_aug_c.h | 0 SConstruct | 2 ++ Source/Core/VideoCommon/Src/HiresTextures.cpp | 2 +- Source/Core/VideoCommon/Src/SConscript | 4 ---- Source/Plugins/Plugin_VideoOGL/Src/SConscript | 2 +- 14 files changed, 4 insertions(+), 6 deletions(-) rename {Source/Core/VideoCommon/Src => Externals}/SOIL/SOIL.c (100%) rename {Source/Core/VideoCommon/Src => Externals}/SOIL/SOIL.h (100%) rename {Source/Core/VideoCommon/Src => Externals}/SOIL/image_DXT.c (100%) rename {Source/Core/VideoCommon/Src => Externals}/SOIL/image_DXT.h (100%) rename {Source/Core/VideoCommon/Src => Externals}/SOIL/image_helper.c (100%) rename {Source/Core/VideoCommon/Src => Externals}/SOIL/image_helper.h (100%) rename {Source/Core/VideoCommon/Src => Externals}/SOIL/stb_image_aug.c (100%) rename {Source/Core/VideoCommon/Src => Externals}/SOIL/stb_image_aug.h (100%) rename {Source/Core/VideoCommon/Src => Externals}/SOIL/stbi_DDS_aug.h (100%) rename {Source/Core/VideoCommon/Src => Externals}/SOIL/stbi_DDS_aug_c.h (100%) diff --git a/Source/Core/VideoCommon/Src/SOIL/SOIL.c b/Externals/SOIL/SOIL.c similarity index 100% rename from Source/Core/VideoCommon/Src/SOIL/SOIL.c rename to Externals/SOIL/SOIL.c diff --git a/Source/Core/VideoCommon/Src/SOIL/SOIL.h b/Externals/SOIL/SOIL.h similarity index 100% rename from Source/Core/VideoCommon/Src/SOIL/SOIL.h rename to Externals/SOIL/SOIL.h diff --git a/Source/Core/VideoCommon/Src/SOIL/image_DXT.c b/Externals/SOIL/image_DXT.c similarity index 100% rename from Source/Core/VideoCommon/Src/SOIL/image_DXT.c rename to Externals/SOIL/image_DXT.c diff --git a/Source/Core/VideoCommon/Src/SOIL/image_DXT.h b/Externals/SOIL/image_DXT.h similarity index 100% rename from Source/Core/VideoCommon/Src/SOIL/image_DXT.h rename to Externals/SOIL/image_DXT.h diff --git a/Source/Core/VideoCommon/Src/SOIL/image_helper.c b/Externals/SOIL/image_helper.c similarity index 100% rename from Source/Core/VideoCommon/Src/SOIL/image_helper.c rename to Externals/SOIL/image_helper.c diff --git a/Source/Core/VideoCommon/Src/SOIL/image_helper.h b/Externals/SOIL/image_helper.h similarity index 100% rename from Source/Core/VideoCommon/Src/SOIL/image_helper.h rename to Externals/SOIL/image_helper.h diff --git a/Source/Core/VideoCommon/Src/SOIL/stb_image_aug.c b/Externals/SOIL/stb_image_aug.c similarity index 100% rename from Source/Core/VideoCommon/Src/SOIL/stb_image_aug.c rename to Externals/SOIL/stb_image_aug.c diff --git a/Source/Core/VideoCommon/Src/SOIL/stb_image_aug.h b/Externals/SOIL/stb_image_aug.h similarity index 100% rename from Source/Core/VideoCommon/Src/SOIL/stb_image_aug.h rename to Externals/SOIL/stb_image_aug.h diff --git a/Source/Core/VideoCommon/Src/SOIL/stbi_DDS_aug.h b/Externals/SOIL/stbi_DDS_aug.h similarity index 100% rename from Source/Core/VideoCommon/Src/SOIL/stbi_DDS_aug.h rename to Externals/SOIL/stbi_DDS_aug.h diff --git a/Source/Core/VideoCommon/Src/SOIL/stbi_DDS_aug_c.h b/Externals/SOIL/stbi_DDS_aug_c.h similarity index 100% rename from Source/Core/VideoCommon/Src/SOIL/stbi_DDS_aug_c.h rename to Externals/SOIL/stbi_DDS_aug_c.h diff --git a/SConstruct b/SConstruct index ab8c0724f4..5437167761 100644 --- a/SConstruct +++ b/SConstruct @@ -51,6 +51,7 @@ include_paths = [ basedir + 'Source/Core/DebuggerWX/Src', basedir + 'Externals/Bochs_disasm', basedir + 'Externals/LZO', + basedir + 'Externals/SOIL', basedir + 'Externals/WiiUseSrc/Src', basedir + 'Source/Core/VideoCommon/Src', basedir + 'Source/Core/InputCommon/Src', @@ -61,6 +62,7 @@ include_paths = [ dirs = [ 'Externals/Bochs_disasm', 'Externals/LZO', + 'Externals/SOIL', 'Externals/WiiUseSrc/Src', 'Source/Core/Common/Src', 'Source/Core/Core/Src', diff --git a/Source/Core/VideoCommon/Src/HiresTextures.cpp b/Source/Core/VideoCommon/Src/HiresTextures.cpp index e3cc78c849..505c087b96 100644 --- a/Source/Core/VideoCommon/Src/HiresTextures.cpp +++ b/Source/Core/VideoCommon/Src/HiresTextures.cpp @@ -19,7 +19,7 @@ #include #include -#include "SOIL/SOIL.h" +#include "../../../Externals/SOIL/SOIL.h" #include "CommonPaths.h" #include "FileUtil.h" #include "FileSearch.h" diff --git a/Source/Core/VideoCommon/Src/SConscript b/Source/Core/VideoCommon/Src/SConscript index 75deb37829..ea2c01bba3 100644 --- a/Source/Core/VideoCommon/Src/SConscript +++ b/Source/Core/VideoCommon/Src/SConscript @@ -31,10 +31,6 @@ files = [ 'VideoState.cpp', 'Profiler.cpp', 'HiresTextures.cpp', - 'SOIL/image_DXT.c', - 'SOIL/image_helper.c', - 'SOIL/SOIL.c', - 'SOIL/stb_image_aug.c' ] env_common = env.Clone() diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript index 70a1627bbf..9e6a29369a 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript +++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript @@ -31,7 +31,7 @@ compileFlags = [ linkFlags = [ ] libs = [ - 'videocommon', 'common', + 'videocommon', 'soil', 'common', ] gfxenv = env.Clone()