From 813c54a1663f33fb41ff5db234e22b757dd92de4 Mon Sep 17 00:00:00 2001
From: xawotihs <xawotihs@gmail.com>
Date: Sun, 19 Jun 2016 12:46:17 +0200
Subject: [PATCH] Removed GL_CLAMP usage, update of the Android cmake package
 file

---
 JGE/src/pc/JGfx.cpp                      | 2 --
 platforms/android/package/CMakeLists.txt | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/JGE/src/pc/JGfx.cpp b/JGE/src/pc/JGfx.cpp
index 5b98591d3..4c40b5a72 100644
--- a/JGE/src/pc/JGfx.cpp
+++ b/JGE/src/pc/JGfx.cpp
@@ -2322,8 +2322,6 @@ void JRenderer::TransferTextureToGLContext(JTexture& inTexture)
             // Pay attention when doing texture mapping!!!
 
             glBindTexture(GL_TEXTURE_2D, mCurrentTex);    // Bind To The Texture ID
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
             /* NOT USED
             if (mode == TEX_TYPE_MIPMAP)			// generate mipmaps
diff --git a/platforms/android/package/CMakeLists.txt b/platforms/android/package/CMakeLists.txt
index 97e42a3d3..9bbb75bd9 100644
--- a/platforms/android/package/CMakeLists.txt
+++ b/platforms/android/package/CMakeLists.txt
@@ -100,7 +100,8 @@ add_custom_command(
 #         COMMAND ${CMAKE_COMMAND} -E copy "${OPENSL_LIBRARY}" "${PACKAGE_DIR}/libs/${ANDROID_NDK_ABI_NAME}/"
          COMMAND ${CMAKE_COMMAND} -E copy "${wagic_location}" "${PACKAGE_DIR}/libs/${ANDROID_NDK_ABI_NAME}/"
          COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/src" "${PACKAGE_DIR}/src"
-         COMMAND ${ANDROID_EXECUTABLE} --silent update project --path "${PACKAGE_DIR}" --target "android-${ANDROID_NATIVE_API_LEVEL}" --name "${target_name}"
+#         COMMAND ${ANDROID_EXECUTABLE} --silent update project --path "${PACKAGE_DIR}" --target "android-${ANDROID_NATIVE_API_LEVEL}" --name "${target_name}"
+         COMMAND ${ANDROID_EXECUTABLE} --silent update project --path "${PACKAGE_DIR}" --target "android-10" --name "${target_name}"
          COMMAND ${ANT_EXECUTABLE} -noinput -k ${android_build_type}
          COMMAND ${CMAKE_COMMAND} -E touch "${APK_NAME}"
          WORKING_DIRECTORY "${PACKAGE_DIR}"