[Android] Remove the now unused texture loader on the JNI side of thi…

…ngs.
dolphin-emu · Dec 12, 2013 · 40b3534 · 40b3534
1 parent 0e1e14b
commit 40b3534
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 191 deletions.
diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
@@ -101,8 +101,7 @@ if(wxWidgets_FOUND)
 	set(WXLIBS ${wxWidgets_LIBRARIES} dl)
 else()
 	if(ANDROID)
-		set(SRCS Src/Android/TextureLoader.cpp
-			 Src/Android/ButtonManager.cpp
+		set(SRCS Src/Android/ButtonManager.cpp
 			 Src/MainAndroid.cpp)
 	else()
 		set(SRCS Src/MainNoGUI.cpp)

diff --git a/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp
@@ -17,7 +17,6 @@
 
 #include <unordered_map>
 #include "GLInterface.h"
-#include "Android/TextureLoader.h"
 #include "Android/ButtonManager.h"
 
 extern void DrawButton(GLuint tex, float *coords);

diff --git a/Source/Core/DolphinWX/Src/Android/ButtonManager.h b/Source/Core/DolphinWX/Src/Android/ButtonManager.h
@@ -20,7 +20,6 @@
 #include <string>
 #include <map>
 #include "CommonPaths.h"
-#include "Android/TextureLoader.h"
 #include "VideoBackendBase.h"
 
 namespace ButtonManager

diff --git a/Source/Core/DolphinWX/Src/Android/TextureLoader.cpp b/Source/Core/DolphinWX/Src/Android/TextureLoader.cpp
diff --git a/Source/Core/DolphinWX/Src/Android/TextureLoader.h b/Source/Core/DolphinWX/Src/Android/TextureLoader.h