From 3d68608024d395c415c59f8018e07d78511d50a9 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Wed, 22 Dec 2010 06:45:59 +0000 Subject: [PATCH] Fix Unix build. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6645 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/CMakeLists.txt | 4 ++-- Source/Core/Common/Src/SConscript | 4 ++-- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 2 +- Source/Core/DiscIO/Src/BannerLoaderWii.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index 612d8d14fe..915110ded5 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -30,8 +30,8 @@ set(SRCS Src/ABI.cpp Src/Version.cpp Src/x64Analyzer.cpp Src/x64Emitter.cpp - Src/Crypto/aes_cbc.cpp - Src/Crypto/aes_core.cpp + Src/Crypto/aes_cbc.c + Src/Crypto/aes_core.c Src/Crypto/bn.cpp Src/Crypto/ec.cpp Src/Crypto/md5.cpp diff --git a/Source/Core/Common/Src/SConscript b/Source/Core/Common/Src/SConscript index 7c8433ed2d..34dcec56bb 100644 --- a/Source/Core/Common/Src/SConscript +++ b/Source/Core/Common/Src/SConscript @@ -42,8 +42,8 @@ files = [ "Version.cpp", "x64Emitter.cpp", "x64Analyzer.cpp", - "Crypto/aes_cbc.cpp", - "Crypto/aes_core.cpp", + "Crypto/aes_cbc.c", + "Crypto/aes_core.c", "Crypto/bn.cpp", "Crypto/ec.cpp", "Crypto/md5.cpp", diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp index ea82243c7f..5a8ec7e968 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -51,7 +51,7 @@ #include "../PowerPC/PowerPC.h" #include "../VolumeHandler.h" #include "FileUtil.h" -#include "AES/aes.h" +#include "Crypto/aes.h" #include "../Boot/Boot_DOL.h" #include "NandPaths.h" diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp index 215e944cf1..5464c68df8 100644 --- a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp +++ b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp @@ -209,4 +209,4 @@ void CBannerLoaderWii::decode5A3image(u32* dst, u16* src, int width, int height) } } -} // namespace \ No newline at end of file +} // namespace