updated gitignore to include ffmpeg and h264

This commit is contained in:
Maxwell Talbot
2021-02-22 13:55:42 +00:00
parent c66d29a571
commit cfcbaac302
3 changed files with 155 additions and 15 deletions

2
.gitignore vendored
View File

@@ -61,6 +61,8 @@ build/bin
# Skia dependencies
skia/dependencies/skia
skia/dependencies/glfw_build
skia/dependencies/FFmpeg
skia/dependencies/x264
skia/renderer/build/bin
skia/**/build/bin
/skia/dependencies/glfw

94
.vscode/settings.json vendored
View File

@@ -1,5 +1,95 @@
{
"files.associations": {
"type_traits": "cpp"
}
"type_traits": "cpp",
"string": "cpp",
"bitset": "cpp",
"charconv": "cpp",
"__bit_reference": "cpp",
"__config": "cpp",
"__debug": "cpp",
"__errc": "cpp",
"__functional_base": "cpp",
"__hash_table": "cpp",
"__locale": "cpp",
"__mutex_base": "cpp",
"__node_handle": "cpp",
"__nullptr": "cpp",
"__split_buffer": "cpp",
"__sso_allocator": "cpp",
"__std_stream": "cpp",
"__string": "cpp",
"__threading_support": "cpp",
"__tree": "cpp",
"__tuple": "cpp",
"algorithm": "cpp",
"any": "cpp",
"array": "cpp",
"atomic": "cpp",
"bit": "cpp",
"cctype": "cpp",
"chrono": "cpp",
"cinttypes": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"codecvt": "cpp",
"complex": "cpp",
"condition_variable": "cpp",
"csignal": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"deque": "cpp",
"exception": "cpp",
"forward_list": "cpp",
"fstream": "cpp",
"functional": "cpp",
"future": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"ios": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"iterator": "cpp",
"limits": "cpp",
"list": "cpp",
"locale": "cpp",
"map": "cpp",
"memory": "cpp",
"mutex": "cpp",
"new": "cpp",
"numeric": "cpp",
"optional": "cpp",
"ostream": "cpp",
"queue": "cpp",
"random": "cpp",
"ratio": "cpp",
"regex": "cpp",
"set": "cpp",
"shared_mutex": "cpp",
"sstream": "cpp",
"stack": "cpp",
"stdexcept": "cpp",
"streambuf": "cpp",
"string_view": "cpp",
"strstream": "cpp",
"system_error": "cpp",
"thread": "cpp",
"tuple": "cpp",
"typeinfo": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"utility": "cpp",
"valarray": "cpp",
"variant": "cpp",
"vector": "cpp",
"*.ipp": "cpp"
},
"git.ignoreLimitWarning": true
}

View File

@@ -1,29 +1,76 @@
workspace "rive_recorder"
workspace "rive"
configurations {"debug", "release"}
BASE_DIR = path.getabsolute("../../../build")
location("./")
dofile(path.join(BASE_DIR, "premake5.lua"))
BASE_DIR = path.getabsolute("../../renderer/build")
location("./")
dofile(path.join(BASE_DIR, "premake5.lua"))
project "rive_recorder"
kind "ConsoleApp"
language "C++"
cppdialect "C++17"
targetdir "bin/%{cfg.buildcfg}"
objdir "obj/%{cfg.buildcfg}"
includedirs {"../../../include", "../../renderer/include", "../../dependencies/skia",
"../../dependencies/skia/include/core", "../../dependencies/skia/include/effects",
"../../dependencies/skia/include/gpu", "../../dependencies/skia/include/config"}
includedirs {"../include", "../../../include", "../../renderer/include", "../../dependencies/glfw/include",
"../../dependencies/skia", "../../dependencies/skia/include/core",
"../../dependencies/skia/include/effects", "../../dependencies/skia/include/gpu",
"../../dependencies/skia/include/config",
"../../dependencies/FFmpeg",
"../../dependencies/x264/include",
"/usr/local/include",
}
if os.host() == "macosx" then
links {"Cocoa.framework", "rive", "skia", "rive_skia_renderer"}
else
links {"rive", "skia", "rive_skia_renderer"}
end
links {"avcodec", "avformat", "avutil", "swscale"}
libdirs {"../../../build/bin/%{cfg.buildcfg}", "../../dependencies/skia/out/Static",
"../../renderer/build/bin/%{cfg.buildcfg}"}
links {
"avcodec",
"avformat",
"avutil",
"glfw3",
"z",
"bz2",
"iconv",
"lzma",
"m",
"rive_skia_renderer",
"rive",
"skia",
"swscale",
"swresample",
"AudioToolbox.framework",
"AudioUnit.framework",
"Cocoa.framework",
"CoreFoundation.framework",
"CoreServices.framework",
"CoreVideo.framework",
"CoreMedia.framework",
"Security.framework",
"IOKit.framework",
"VideoToolbox.framework",
"x264",
}
libdirs {
"../../../build/bin/%{cfg.buildcfg}",
"../../dependencies/FFmpeg/libavcodec",
"../../dependencies/FFmpeg/libavformat",
"../../dependencies/FFmpeg/libavutil",
"../../dependencies/FFmpeg/libswscale",
"../../dependencies/FFmpeg/libswresample",
"../../dependencies/x264/lib",
"../../dependencies/glfw_build/src",
"../../dependencies/skia/out/Static",
"../../renderer/build/bin/%{cfg.buildcfg}",
"/usr/local/lib",
}
files {"../src/**.cpp"}
buildoptions {"-Wall"}
buildoptions {"-Wall", "-fno-rtti"}
filter "configurations:debug"
defines {"DEBUG"}
@@ -31,6 +78,7 @@ symbols "On"
filter "configurations:release"
defines {"RELEASE"}
defines { "NDEBUG" }
optimize "On"
-- Clean Function --