Skip to content

Commit

Permalink
(re-factoring) adding Sub3D optional sub-module, CropDetect function …
Browse files Browse the repository at this point in the history
…now in ssifSource.dll
  • Loading branch information
slavanap committed Jun 12, 2016
1 parent ba308f1 commit f1b3d58
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
[submodule "thirdparty/JM"]
path = thirdparty/JM
url = https://github.com/slavanap/JM.git
[submodule "Sub3D"]
path = Sub3D
url = p:/sub3d
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)

add_definitions(-D _UNICODE)

add_subdirectory(thirdparty)

add_subdirectory(CoreAVCWrapper)
add_subdirectory(FilmTester)
add_subdirectory(AvsTools)
add_subdirectory(LoadHelper)

add_subdirectory(thirdparty/BaseClasses)
add_subdirectory(ssifSource)

add_subdirectory(thirdparty/lua)
add_subdirectory(thirdparty/tinyxml2)
add_subdirectory(Sub3D)
if (EXISTS "${PROJECT_SOURCE_DIR}/Sub3D/CMakeLists.txt")
add_subdirectory(Sub3D)
endif()

set(CPACK_GENERATOR NSIS)
set(CPACK_PACKAGE_NAME "ssifSource")
Expand Down
1 change: 1 addition & 0 deletions Sub3D
Submodule Sub3D added at fbcd6c
2 changes: 2 additions & 0 deletions ssifSource/dllmain.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "stdafx.h"
#include <Filter.Pipe.hpp>
#include <Tools.WinApi.hpp>
#include <Filter.CropDetect.hpp>

#include "Filter.mplsSource.hpp"
#include "Filter.mplsSource2.hpp"
Expand Down Expand Up @@ -30,6 +31,7 @@ const char* WINAPI AvisynthPluginInit2(IScriptEnvironment* env) {
env->AddFunction("PipeReaderForHandle", Filter::Pipe::PipeReader::CreateForHandleParams, Filter::Pipe::PipeReader::CreateForHandle, nullptr);
env->AddFunction("PipeWriter", Filter::Pipe::PipeWriter::CreateParams, Filter::Pipe::PipeWriter::Create, nullptr);
env->AddFunction("PipeWriterForHandle", Filter::Pipe::PipeWriter::CreateForHandleParams, Filter::Pipe::PipeWriter::CreateForHandle, nullptr);
env->AddFunction("CropDetect", Filter::CropDetect::CreateParams, Filter::CropDetect::Create, nullptr);
env->AddFunction("ssifSource", Filter::ssifSource::CreateParams, Filter::ssifSource::Create, nullptr);
env->AddFunction("mplsSource", Filter::mplsSource::CreateParams, Filter::mplsSource::Create, nullptr);
env->AddFunction("mplsSource2", Filter::mplsSource2::CreateParams, Filter::mplsSource2::Create, nullptr);
Expand Down
10 changes: 10 additions & 0 deletions thirdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
add_subdirectory(BaseClasses)
set(BASECLASSES_INCLUDE_DIR ${BASECLASSES_INCLUDE_DIR} PARENT_SCOPE)

add_subdirectory(tinyxml2)

project(Lua)
file(GLOB SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Lua/src/*.c Lua/src/*.h)
list(REMOVE_ITEM SOURCES Lua/src/luac.c)
add_library(${PROJECT_NAME} ${SOURCES})
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Third Party")
2 changes: 1 addition & 1 deletion thirdparty/JM
Submodule JM updated 0 files

0 comments on commit f1b3d58

Please sign in to comment.