diff --git a/build/lol-build b/build/lol-build index 2878b792..84bff820 100755 --- a/build/lol-build +++ b/build/lol-build @@ -164,11 +164,11 @@ configure() fi PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/external/gtkglarea-2.0.1/lib/pkgconfig" PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/external/libcaca-0.99.beta18/lib/pkgconfig" - LDFLAGS="$LDFLAGS -L$PWD/external/ffmpeg-20141018/lib/i686-w64-mingw32" - LDFLAGS="$LDFLAGS -L$PWD/external/glew-1.9.0/lib/i686-w64-mingw32" - LDFLAGS="$LDFLAGS -L$PWD/external/sdl-2.0.3/lib/i686-w64-mingw32" - LDFLAGS="$LDFLAGS -L$PWD/external/sdl-image-2.0.0/lib/i686-w64-mingw32" - LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-2.0.0/lib/i686-w64-mingw32" + LDFLAGS="$LDFLAGS -L$PWD/external/ffmpeg-20190130/lib/i686-w64-mingw32" + LDFLAGS="$LDFLAGS -L$PWD/external/glew-2.1.0/lib/i686-w64-mingw32" + LDFLAGS="$LDFLAGS -L$PWD/external/sdl-2.0.9/lib/i686-w64-mingw32" + LDFLAGS="$LDFLAGS -L$PWD/external/sdl-image-2.0.4/lib/i686-w64-mingw32" + LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-2.0.4/lib/i686-w64-mingw32" LDFLAGS="$LDFLAGS -L$PWD/external/gtk-2.22.1/lib" LDFLAGS="$LDFLAGS -L$PWD/external/gtk-2.22.1/bin" LDFLAGS="$LDFLAGS -L$PWD/external/gtkglarea-2.0.1/lib" @@ -190,11 +190,11 @@ configure() fi PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/external/gtkglarea-2.0.1/lib/pkgconfig" PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/external/libcaca-0.99.beta18/lib/pkgconfig" - LDFLAGS="$LDFLAGS -L$PWD/external/ffmpeg-20141018/lib/x86_64-w64-mingw32" - LDFLAGS="$LDFLAGS -L$PWD/external/glew-1.9.0/lib/x86_64-w64-mingw32" - LDFLAGS="$LDFLAGS -L$PWD/external/sdl-2.0.3/lib/x86_64-w64-mingw32" - LDFLAGS="$LDFLAGS -L$PWD/external/sdl-image-2.0.0/lib/x86_64-mingw32" - LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-2.0.0/lib/x86_64-mingw32" + LDFLAGS="$LDFLAGS -L$PWD/external/ffmpeg-20190130/lib/x86_64-w64-mingw32" + LDFLAGS="$LDFLAGS -L$PWD/external/glew-2.1.0/lib/x86_64-w64-mingw32" + LDFLAGS="$LDFLAGS -L$PWD/external/sdl-2.0.9/lib/x86_64-w64-mingw32" + LDFLAGS="$LDFLAGS -L$PWD/external/sdl-image-2.0.4/lib/x86_64-w64-mingw32" + LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-2.0.4/lib/x86_64-w64-mingw32" LDFLAGS="$LDFLAGS -L$PWD/external/libcaca-0.99.beta18/lib/x86_64-w64-mingw32" ;; *-i386) @@ -241,11 +241,11 @@ configure() do_configure CXX=clang++ CC=clang ;; win*-i386|win*-amd64) - CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-2.0.3/include" - CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-image-2.0.0/include" - CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-mixer-2.0.0/include" - CPPFLAGS="$CPPFLAGS -I$PWD/external/ffmpeg-20141018/include" - CPPFLAGS="$CPPFLAGS -I$PWD/external/glew-1.9.0/include/GL -DGLEW_STATIC" + CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-2.0.9/include" + CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-image-2.0.4/include" + CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-mixer-2.0.4/include" + CPPFLAGS="$CPPFLAGS -I$PWD/external/ffmpeg-20190130/include" + CPPFLAGS="$CPPFLAGS -I$PWD/external/glew-2.1.0/include/GL -DGLEW_STATIC" CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/lib/glib-2.0/include" CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/lib/gtk-2.0/include" CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/include/glib-2.0" diff --git a/build/msbuild/lol.vars.props b/build/msbuild/lol.vars.props index bfbae461..45d34f79 100644 --- a/build/msbuild/lol.vars.props +++ b/build/msbuild/lol.vars.props @@ -12,12 +12,6 @@ $(LolDir)\src\3rdparty\imgui $(ImguiDir) - - $(ExternalDir)\libgcc-4.9 - $(LibGccDir)\lib\i686-w64-mingw32 - $(LibGccDir)\lib\x86_64-w64-mingw32 - libgcc.lib - $(ExternalDir)\gtk-2.22.1 $(ExternalDir)\gtkglarea-2.0.1 @@ -26,14 +20,15 @@ gobject-2.0.lib;gthread-2.0.lib;glib-2.0.lib;gdk-win32-2.0.lib;gtk-win32-2.0.lib;gtkgl-2.0.lib + zlibstatic.lib;assimp.lib zlibstatic.lib;assimp.lib LOL_USE_ASSIMP;$(Win32Defines) +--> $(ExternalDir)\libcaca-0.99.beta18 @@ -64,7 +59,7 @@ - $(ExternalDir)\glew-1.9.0 + $(ExternalDir)\glew-2.1.0 $(GlewDir)\include $(GlewDir)\lib\i686-w64-mingw32 $(GlewDir)\lib\x86_64-w64-mingw32 @@ -75,11 +70,11 @@ - $(ExternalDir)\sdl-2.0.3 - $(ExternalDir)\sdl-image-2.0.0 - $(ExternalDir)\sdl-mixer-2.0.0 + $(ExternalDir)\sdl-2.0.9 + $(ExternalDir)\sdl-image-2.0.4 + $(ExternalDir)\sdl-mixer-2.0.4 $(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include - $(SdlDir)\lib\i686-w64-mingw32;$(SdlImageDir)\lib\i686-w64-msvc;$(SdlMixerDir)\lib\i686-w64-msvc + $(SdlDir)\lib\i686-msvc;$(SdlImageDir)\lib\i686-msvc;$(SdlMixerDir)\lib\i686-msvc $(SdlDir)\lib\x86_64-msvc;$(SdlImageDir)\lib\x86_64-msvc;$(SdlMixerDir)\lib\x86_64-msvc SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_mixer.lib SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_mixer.lib @@ -88,16 +83,14 @@ - diff --git a/external b/external index 022abdf6..5c69af05 160000 --- a/external +++ b/external @@ -1 +1 @@ -Subproject commit 022abdf6ab5c93f9a1658bbd55cb3f5892f255b2 +Subproject commit 5c69af05427027226c576112c9dd3352b047cd9c diff --git a/lol.sln b/lol.sln index 86cec3eb..5d53f090 100644 --- a/lol.sln +++ b/lol.sln @@ -60,6 +60,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "15_lolimgui", "doc\tutorial EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "14_lol_lua", "doc\tutorial\14_lol_lua.vcxproj", "{31B96262-1C41-43B9-BA38-27AA385B05DB}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "16_movie", "doc\tutorial\16_movie.vcxproj", "{5F5714D0-1C3D-4522-A409-214C5A2951AA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ORBIS = Debug|ORBIS @@ -304,6 +306,18 @@ Global {31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|Win32.Build.0 = Release|Win32 {31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|x64.ActiveCfg = Release|x64 {31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|x64.Build.0 = Release|x64 + {5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|ORBIS.ActiveCfg = Debug|ORBIS + {5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|ORBIS.Build.0 = Debug|ORBIS + {5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|Win32.ActiveCfg = Debug|Win32 + {5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|Win32.Build.0 = Debug|Win32 + {5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|x64.ActiveCfg = Debug|x64 + {5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|x64.Build.0 = Debug|x64 + {5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|ORBIS.ActiveCfg = Release|ORBIS + {5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|ORBIS.Build.0 = Release|ORBIS + {5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|Win32.ActiveCfg = Release|Win32 + {5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|Win32.Build.0 = Release|Win32 + {5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|x64.ActiveCfg = Release|x64 + {5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -332,6 +346,7 @@ Global {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} {81C83B42-D00A-4FA3-9A3D-80F9D46524BF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} {31B96262-1C41-43B9-BA38-27AA385B05DB} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} + {5F5714D0-1C3D-4522-A409-214C5A2951AA} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {47D50023-EEA2-48DA-8902-F96357602A79}