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
This commit is contained in:
nakeee 2009-05-08 09:31:57 +00:00
parent 84cd78d9c7
commit 1e07b26356
14 changed files with 4 additions and 6 deletions

View File

@ -51,6 +51,7 @@ include_paths = [
basedir + 'Source/Core/DebuggerWX/Src', basedir + 'Source/Core/DebuggerWX/Src',
basedir + 'Externals/Bochs_disasm', basedir + 'Externals/Bochs_disasm',
basedir + 'Externals/LZO', basedir + 'Externals/LZO',
basedir + 'Externals/SOIL',
basedir + 'Externals/WiiUseSrc/Src', basedir + 'Externals/WiiUseSrc/Src',
basedir + 'Source/Core/VideoCommon/Src', basedir + 'Source/Core/VideoCommon/Src',
basedir + 'Source/Core/InputCommon/Src', basedir + 'Source/Core/InputCommon/Src',
@ -61,6 +62,7 @@ include_paths = [
dirs = [ dirs = [
'Externals/Bochs_disasm', 'Externals/Bochs_disasm',
'Externals/LZO', 'Externals/LZO',
'Externals/SOIL',
'Externals/WiiUseSrc/Src', 'Externals/WiiUseSrc/Src',
'Source/Core/Common/Src', 'Source/Core/Common/Src',
'Source/Core/Core/Src', 'Source/Core/Core/Src',

View File

@ -19,7 +19,7 @@
#include <cstring> #include <cstring>
#include <utility> #include <utility>
#include "SOIL/SOIL.h" #include "../../../Externals/SOIL/SOIL.h"
#include "CommonPaths.h" #include "CommonPaths.h"
#include "FileUtil.h" #include "FileUtil.h"
#include "FileSearch.h" #include "FileSearch.h"

View File

@ -31,10 +31,6 @@ files = [
'VideoState.cpp', 'VideoState.cpp',
'Profiler.cpp', 'Profiler.cpp',
'HiresTextures.cpp', 'HiresTextures.cpp',
'SOIL/image_DXT.c',
'SOIL/image_helper.c',
'SOIL/SOIL.c',
'SOIL/stb_image_aug.c'
] ]
env_common = env.Clone() env_common = env.Clone()

View File

@ -31,7 +31,7 @@ compileFlags = [
linkFlags = [ linkFlags = [
] ]
libs = [ libs = [
'videocommon', 'common', 'videocommon', 'soil', 'common',
] ]
gfxenv = env.Clone() gfxenv = env.Clone()