CMake: Purge all the bundled dependencies

The actual thirdparty files will be removed in the next commit.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44b178d40b48e096771546ec58c46bd5f6f88d9b..57d8f86fea65dbc2c6a8ac73ab1a6f5f063da1dc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,6 @@ cmake_policy(SET CMP0004 OLD)
 INCLUDE(FindPkgConfig)
 
 set(SRCDIR "${CMAKE_CURRENT_SOURCE_DIR}/Source")
-set(DEPDIR "${CMAKE_CURRENT_SOURCE_DIR}/Dependencies")
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 --std=c++11")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -g -pg --std=c++11")
@@ -26,29 +25,14 @@ endif(NOT LUGARU_INSTALL_PREFIX)
 
 set(CMAKE_INSTALL_PREFIX "${LUGARU_INSTALL_PREFIX}" CACHE INTERNAL "Prefix prepended to install directories" FORCE)
 
-if(MINGW)
-    set(OPENGL_gl_LIBRARY "-lopengl32" CACHE STRING "OpenGL library for Win32" FORCE)
-    set(OPENGL_glu_LIBRARY "-lglu32" CACHE STRING "GLU library for Win32" FORCE)
-endif(MINGW)
-
 if(APPLE)
-    set(CMAKE_OSX_ARCHITECTURES "i386;x86_64;ppc" CACHE STRING "Build architectures for OSX")
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING
+    set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Build architectures for OSX")
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING
         "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value")
-    set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk" CACHE PATH
+    set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.10.sdk" CACHE PATH
         "The product will be built against the headers and libraries located inside the indicated SDK.")
 endif(APPLE)
 
-if(APPLE)
-    # Save our sanity; Set all available libraries to internal by default
-    set(LUGARU_FORCE_INTERNAL_GLU True)
-    set(LUGARU_FORCE_INTERNAL_JPEG True)
-    set(LUGARU_FORCE_INTERNAL_PNG True)
-    set(LUGARU_FORCE_INTERNAL_VORBIS True)
-    set(LUGARU_FORCE_INTERNAL_ZLIB True)
-    set(LUGARU_FORCE_INTERNAL_OPENAL True)
-endif(APPLE)
-
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
 set(LUGARU_SRCS
@@ -130,14 +114,6 @@ if(UNIX)
     )
 endif(UNIX)
 
-if(MSVC) # MSVC non-C99 support biting us hard
-    set(LUGARU_H
-        ${LUGARU_H}
-        ${DEPDIR}/msinttypes/stdint.h
-        ${DEPDIR}/msinttypes/inttypes.h
-    )
-endif(MSVC)
-
 if(WIN32)
     ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
                         COMMAND ${CMAKE_RC_COMPILER}
@@ -163,230 +139,22 @@ if (APPLE)
 endif (APPLE)
 
 # Deal with dependencies...
-find_package(OpenGL REQUIRED)
-# force this include dir no matter what on Windows, so we get sane headers.
-option (LUGARU_FORCE_INTERNAL_OPENGL "Force internal OpenGL headers, even if there's a system version" True)
-if (LUGARU_FORCE_INTERNAL_OPENGL)
-    include_directories("${DEPDIR}/OpenGL")
-endif (LUGARU_FORCE_INTERNAL_OPENGL)
-
-if(MSVC) # More Visual Studio annoyances
-    include_directories("${DEPDIR}/msinttypes")
-endif(MSVC)
 
-option (LUGARU_FORCE_INTERNAL_OPENAL "Force internal libOpenAL, even if there's a system version" False)
-if (NOT LUGARU_FORCE_INTERNAL_OPENAL)
-    if (WIN32)
-        pkg_check_modules(OPENAL openal)
-        set(OPENAL_LIBRARY ${OPENAL_LIBRARIES})
-    else (WIN32)
-        find_package(OpenAL REQUIRED)
-    endif()
-endif (NOT LUGARU_FORCE_INTERNAL_OPENAL)
+find_package(OpenGL REQUIRED)
 
-if (NOT OPENAL_FOUND OR LUGARU_FORCE_INTERNAL_OPENAL)
-    message(STATUS "Using internal copy of OpenAL")
-    message(ERROR "*** Not implemented, terminating.")
-    # FIXME: We should  allow building OpenAL from source, for all platforms
-endif (NOT OPENAL_FOUND OR LUGARU_FORCE_INTERNAL_OPENAL)
+# Windows is funky about OpenAL detection
+if (WIN32)
+    pkg_check_modules(OPENAL openal REQUIRED)
+    set(OPENAL_LIBRARY ${OPENAL_LIBRARIES})
+else (WIN32)
+    find_package(OpenAL REQUIRED)
+endif()
 
 find_package(sdl2 REQUIRED)
-
-option (LUGARU_FORCE_INTERNAL_PNG "Force internal libPNG, even if there's a system version" False)
-if (NOT LUGARU_FORCE_INTERNAL_PNG)
-    find_package(PNG)
-else(NOT LUGARU_FORCE_INTERNAL_PNG)
-    set(PNG_FOUND False)
-endif (NOT LUGARU_FORCE_INTERNAL_PNG)
-
-if (NOT PNG_FOUND)
-    message(STATUS "Using internal copy of libpng")
-    set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} PNG")
-    set(PNGDIR "${DEPDIR}/libpng")
-    set(PNG_INCLUDE_DIR "${PNGDIR}")
-    set(PNG_LIBRARY "")
-    set(LUGARU_SRCS
-        ${LUGARU_SRCS}
-        ${PNGDIR}/png.c
-        ${PNGDIR}/pngerror.c
-        ${PNGDIR}/pngget.c
-        ${PNGDIR}/pngmem.c
-        ${PNGDIR}/pngpread.c
-        ${PNGDIR}/pngread.c
-        ${PNGDIR}/pngrio.c
-        ${PNGDIR}/pngrtran.c
-        ${PNGDIR}/pngrutil.c
-        ${PNGDIR}/pngset.c
-        ${PNGDIR}/pngtrans.c
-        ${PNGDIR}/pngwio.c
-        ${PNGDIR}/pngwrite.c
-        ${PNGDIR}/pngwtran.c
-        ${PNGDIR}/pngwutil.c
-    )
-endif (NOT PNG_FOUND)
-
-option (LUGARU_FORCE_INTERNAL_JPEG "Force internal libJPEG, even if there's a system version" False)
-if (NOT LUGARU_FORCE_INTERNAL_JPEG)
-    find_package(JPEG)
-else(NOT LUGARU_FORCE_INTERNAL_JPEG)
-    set(JPEG_FOUND False)
-endif (NOT LUGARU_FORCE_INTERNAL_JPEG)
-
-if (NOT JPEG_FOUND)
-    message(STATUS "Using internal copy of libjpeg")
-    set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} JPEG")
-    set(JPEGDIR "${DEPDIR}/libjpeg")
-    set(JPEG_INCLUDE_DIR "${JPEGDIR}")
-    set(JPEG_LIBRARY "")
-    set(LUGARU_SRCS
-        ${LUGARU_SRCS}
-        ${JPEGDIR}/jdapistd.c
-        ${JPEGDIR}/jdmaster.c
-        ${JPEGDIR}/jdapimin.c
-        ${JPEGDIR}/jcapimin.c
-        ${JPEGDIR}/jdmerge.c
-        ${JPEGDIR}/jdatasrc.c
-        ${JPEGDIR}/jdatadst.c
-        ${JPEGDIR}/jdcoefct.c
-        ${JPEGDIR}/jdcolor.c
-        ${JPEGDIR}/jddctmgr.c
-        ${JPEGDIR}/jdhuff.c
-        ${JPEGDIR}/jdinput.c
-        ${JPEGDIR}/jdmainct.c
-        ${JPEGDIR}/jdmarker.c
-        ${JPEGDIR}/jdpostct.c
-        ${JPEGDIR}/jdsample.c
-        ${JPEGDIR}/jdtrans.c
-        ${JPEGDIR}/jerror.c
-        ${JPEGDIR}/jidctflt.c
-        ${JPEGDIR}/jidctfst.c
-        ${JPEGDIR}/jidctint.c
-        ${JPEGDIR}/jmemmgr.c
-        ${JPEGDIR}/jutils.c
-        ${JPEGDIR}/jmemnobs.c
-        ${JPEGDIR}/jquant1.c
-        ${JPEGDIR}/jquant2.c
-        ${JPEGDIR}/jcomapi.c
-        ${JPEGDIR}/jcmarker.c
-        ${JPEGDIR}/jcapistd.c
-        ${JPEGDIR}/jcparam.c
-        ${JPEGDIR}/jcinit.c
-        ${JPEGDIR}/jcdctmgr.c
-        ${JPEGDIR}/jccoefct.c
-        ${JPEGDIR}/jcmainct.c
-        ${JPEGDIR}/jfdctflt.c
-        ${JPEGDIR}/jfdctint.c
-        ${JPEGDIR}/jfdctfst.c
-        ${JPEGDIR}/jchuff.c
-        ${JPEGDIR}/jcsample.c
-        ${JPEGDIR}/jcmaster.c
-        ${JPEGDIR}/jccolor.c
-        ${JPEGDIR}/jcprepct.c
-        ${JPEGDIR}/jcarith.c
-        ${JPEGDIR}/jdarith.c
-        ${JPEGDIR}/jaricom.c
-    )
-endif (NOT JPEG_FOUND)
-
-option (LUGARU_FORCE_INTERNAL_ZLIB "Force internal zlib, even if there's a system version" False)
-if (NOT LUGARU_FORCE_INTERNAL_ZLIB)
-    find_package(ZLIB)
-else(NOT LUGARU_FORCE_INTERNAL_ZLIB)
-    set(ZLIB_FOUND False)
-endif (NOT LUGARU_FORCE_INTERNAL_ZLIB)
-
-if (NOT ZLIB_FOUND)
-    message(STATUS "Using internal copy of zlib")
-    set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} ZLIB")
-    set(ZLIBDIR "${DEPDIR}/zlib")
-    set(ZLIB_INCLUDE_DIR "${ZLIBDIR}")
-    set(ZLIB_LIBRARIES "")
-    set(LUGARU_SRCS
-        ${LUGARU_SRCS}
-        ${ZLIBDIR}/adler32.c
-        ${ZLIBDIR}/compress.c
-        ${ZLIBDIR}/crc32.c
-        ${ZLIBDIR}/deflate.c
-        ${ZLIBDIR}/infback.c
-        ${ZLIBDIR}/inffast.c
-        ${ZLIBDIR}/inflate.c
-        ${ZLIBDIR}/inftrees.c
-        ${ZLIBDIR}/trees.c
-        ${ZLIBDIR}/uncompr.c
-        ${ZLIBDIR}/zutil.c
-    )
-endif (NOT ZLIB_FOUND)
-
-option (LUGARU_FORCE_INTERNAL_GLU "Force internal libGLU, even if there's a system version" False)
-if (LUGARU_FORCE_INTERNAL_GLU)
-    set(OPENGL_GLU_FOUND False)
-endif (LUGARU_FORCE_INTERNAL_GLU)
-
-if (NOT OPENGL_GLU_FOUND)
-    message(STATUS "Using internal copy of libGLU")
-    set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} GLU")
-    set(GLUDIR "${DEPDIR}/GLU")
-    set(GLU_INCLUDE_DIR "${GLUDIR}")
-    set(GLU_LIBRARY "")
-    set(LUGARU_SRCS
-        ${LUGARU_SRCS}
-        ${GLUDIR}/dict.c
-        ${GLUDIR}/geom.c
-        ${GLUDIR}/memalloc.c
-        ${GLUDIR}/mesh.c
-        ${GLUDIR}/mipmap.c
-        ${GLUDIR}/normal.c
-        ${GLUDIR}/priorityq.c
-        ${GLUDIR}/render.c
-        ${GLUDIR}/sweep.c
-        ${GLUDIR}/tess.c
-        ${GLUDIR}/tessmono.c
-        ${GLUDIR}/util.c
-    )
-endif (NOT OPENGL_GLU_FOUND)
-
-option (LUGARU_FORCE_INTERNAL_VORBIS "Force internal Vorbis, even if there's a system version" False)
-if (NOT LUGARU_FORCE_INTERNAL_VORBIS)
-    find_package(OggVorbis)
-else(NOT LUGARU_FORCE_INTERNAL_VORBIS)
-    set(OGGVORBIS_FOUND False)
-endif (NOT LUGARU_FORCE_INTERNAL_VORBIS)
-
-if (NOT OGGVORBIS_FOUND)
-    message(STATUS "Using internal copy of Ogg Vorbis")
-    set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} OggVorbis")
-    set(OGGDIR "${DEPDIR}/libogg")
-    set(OGG_INCLUDE_DIR "${OGGDIR}/include")
-    set(OGG_LIBRARY "")
-    set(VORBISDIR "${DEPDIR}/libvorbis")
-    set(VORBISFILE_INCLUDE_DIR "${VORBISDIR}/include")
-    set(VORBISFILE_LIBRARY "")
-    set(LUGARU_SRCS
-        ${LUGARU_SRCS}
-        ${OGGDIR}/src/bitwise.c
-        ${OGGDIR}/src/framing.c
-        ${VORBISDIR}/lib/analysis.c
-        ${VORBISDIR}/lib/bitrate.c
-        ${VORBISDIR}/lib/block.c
-        ${VORBISDIR}/lib/codebook.c
-        ${VORBISDIR}/lib/envelope.c
-        ${VORBISDIR}/lib/floor0.c
-        ${VORBISDIR}/lib/floor1.c
-        ${VORBISDIR}/lib/info.c
-        ${VORBISDIR}/lib/lpc.c
-        ${VORBISDIR}/lib/lsp.c
-        ${VORBISDIR}/lib/mapping0.c
-        ${VORBISDIR}/lib/mdct.c
-        ${VORBISDIR}/lib/psy.c
-        ${VORBISDIR}/lib/registry.c
-        ${VORBISDIR}/lib/res0.c
-        ${VORBISDIR}/lib/sharedbook.c
-        ${VORBISDIR}/lib/smallft.c
-        ${VORBISDIR}/lib/synthesis.c
-        ${VORBISDIR}/lib/vorbisfile.c
-        ${VORBISDIR}/lib/window.c
-    )
-endif (NOT OGGVORBIS_FOUND)
+find_package(PNG REQUIRED)
+find_package(JPEG REQUIRED)
+find_package(ZLIB REQUIRED)
+find_package(OggVorbis REQUIRED)
 
 include_directories(
     ${OPENAL_INCLUDE_DIR}
@@ -394,14 +162,13 @@ include_directories(
     ${PNG_INCLUDE_DIR}
     ${ZLIB_INCLUDE_DIR}
     ${OPENGL_INCLUDE_DIR}
-    ${GLU_INCLUDE_DIR}
     ${SDL2_INCLUDE_DIRS}
     ${VORBISFILE_INCLUDE_DIR}
     ${OGG_INCLUDE_DIR}
     ${CMAKE_SOURCE_DIR}/Source
 )
 
-set(LUGARU_LIBS ${OPENAL_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARIES} ${SDL2_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY} ${PLATFORM_LIBS})
+set(LUGARU_LIBS ${OPENAL_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARIES} ${SDL2_LIBRARIES} ${OPENGL_LIBRARIES} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY} ${PLATFORM_LIBS})
 
 
 if(WIN32)
@@ -470,7 +237,3 @@ endif(NOT APPLE)
 if(APPLE)
     install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data DESTINATION ${APPS_ROOT})
 endif(APPLE)
-
-if (LUGARU_MISSING_DEPS)
-    message(STATUS "Using our copy of these libs: ${LUGARU_MISSING_DEPS}")
-endif (LUGARU_MISSING_DEPS)

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 2c7272d5ec377337a3e27ac6e4eacc929afdad7c..a5ca6c04cc8f513a18a66ad77eb2c099d31e062b 100644 (file)
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -129,10 +129,12 @@ static bool lookup_all_glsyms(void)
     return retval;
 }
 
+#ifndef __MINGW32__ // FIXME: Temporary workaround for GL-8
 static void GLAPIENTRY glDeleteTextures_doNothing(GLsizei n, const GLuint *textures)
 {
     // no-op.
 }
+#endif // __MINGW32__
 
 #ifdef MessageBox
 #undef MessageBox