diff --git a/linux/Makefile.am b/linux/Makefile.am index 22786950..092bba12 100644 --- a/linux/Makefile.am +++ b/linux/Makefile.am @@ -318,7 +318,7 @@ ccextractor_SOURCES = \ ../src/thirdparty/freetype/type42/type42.c \ ../src/thirdparty/freetype/winfonts/winfnt.c -ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP +ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP -DGPAC_HAVE_CONFIG_H ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/thirdparty/gpacmp4/ -I../src/thirdparty/libpng/ -I../src/thirdparty/zlib/ -I../src/thirdparty/zvbi/ -I../src/thirdparty/lib_hash/ -I../src/thirdparty/protobuf-c/ -I../src/thirdparty -I../src/ -I../src/thirdparty/freetype/include/ @@ -326,7 +326,7 @@ ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/thirdparty/gpacmp4/ -I../src/th ccextractor_LDADD=-lm -lpthread -ldl if SYS_IS_LINUX -ccextractor_CFLAGS += -O3 -s -DGPAC_CONFIG_LINUX -D_GF_CONFIG_H_ +ccextractor_CFLAGS += -O3 -s -DGPAC_CONFIG_LINUX endif if SYS_IS_MAC diff --git a/linux/build b/linux/build index c18a87c4..76b228c3 100755 --- a/linux/build +++ b/linux/build @@ -1,5 +1,5 @@ #!/usr/bin/env bash -BLD_FLAGS="$BLD_FLAGS -std=gnu99 -Wno-write-strings -Wno-pointer-sign -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DENABLE_OCR -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP" +BLD_FLAGS="$BLD_FLAGS -std=gnu99 -Wno-write-strings -Wno-pointer-sign -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DENABLE_OCR -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP -DGPAC_HAVE_CONFIG_H" bit_os=$(getconf LONG_BIT) if [ "$bit_os"=="64" ] then diff --git a/mac/Makefile.am b/mac/Makefile.am index 78babc28..84db2fa4 100644 --- a/mac/Makefile.am +++ b/mac/Makefile.am @@ -316,7 +316,7 @@ ccextractor_SOURCES = \ ../src/thirdparty/freetype/winfonts/winfnt.c -ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP +ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP -DGPAC_HAVE_CONFIG_H ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/thirdparty/gpacmp4/ -I../src/thirdparty/libpng/ -I../src/thirdparty/zlib/ -I../src/thirdparty/zvbi/ -I../src/thirdparty/lib_hash/ -I../src/thirdparty/protobuf-c -I../src/thirdparty -I../src -I../src/thirdparty/freetype/include diff --git a/mac/build.command b/mac/build.command index b8b18c6e..77dd4d6c 100755 --- a/mac/build.command +++ b/mac/build.command @@ -1,6 +1,6 @@ #!/bin/bash cd `dirname $0` -BLD_FLAGS="-std=gnu99 -Wno-write-strings -Wno-pointer-sign -DGPAC_CONFIG_DARWIN -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -Dfopen64=fopen -Dopen64=open -Dlseek64=lseek -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP" +BLD_FLAGS="-std=gnu99 -Wno-write-strings -Wno-pointer-sign -DGPAC_CONFIG_DARWIN -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -Dfopen64=fopen -Dopen64=open -Dlseek64=lseek -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP -DGPAC_HAVE_CONFIG_H" [[ $1 = "OCR" ]] && BLD_FLAGS="$BLD_FLAGS -DENABLE_OCR" BLD_INCLUDE="-I../src/ -I../src/lib_ccx -I../src/thirdparty/gpacmp4 -I../src/lib_hash -I../src/thirdparty/libpng -I../src/thirdparty -I../src/thirdparty/protobuf-c -I../src/thirdparty/zlib -I../src/thirdparty/zvbi -I../src/thirdparty/freetype/include" [[ $1 = "OCR" ]] && BLD_INCLUDE="$BLD_INCLUDE `pkg-config --cflags --silence-errors tesseract`" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7462ded1..07c75de5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -40,7 +40,7 @@ configure_file ( "${PROJECT_SOURCE_DIR}/lib_ccx/compile_info_real.h" ) -add_definitions(-DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP) +add_definitions(-DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP -DGPAC_HAVE_CONFIG_H) if(CMAKE_SIZEOF_VOID_P EQUAL 8) add_definitions(-DGPAC_64_BITS) diff --git a/src/thirdparty/gpacmp4/BUILD b/src/thirdparty/gpacmp4/BUILD index b306d7eb..56f8d0f9 100644 --- a/src/thirdparty/gpacmp4/BUILD +++ b/src/thirdparty/gpacmp4/BUILD @@ -2,7 +2,7 @@ cc_library( name = "gpacmp4", srcs = glob(["*.c"]), hdrs = glob(["*.h", "gpac/*.h", "gpac/internal/*.h" ]), - copts = [ "-I src/thirdparty/gpacmp4/" , "-DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DENABLE_OCR -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP" ], + copts = [ "-I src/thirdparty/gpacmp4/" , "-DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DENABLE_OCR -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP -DGPAC_HAVE_CONFIG_H" ], visibility = ["//visibility:public"], ) diff --git a/src/thirdparty/gpacmp4/gpac/config.h b/src/thirdparty/gpacmp4/gpac/config.h new file mode 100644 index 00000000..fc9693ba --- /dev/null +++ b/src/thirdparty/gpacmp4/gpac/config.h @@ -0,0 +1,5 @@ +// hack so that we can define GPAC_HAVE_CONFIG_H to make GPAC not use the default configuration.h + +// We don't use configuration.h because: +// - It defines GPAC_MEMORY_TRACKING on Windows which would mean we would have to pull in alloc.c if we did that +// - It doesn't support Linux, which makes it fail to compile with an "Unknown target platform" error \ No newline at end of file diff --git a/src/thirdparty/gpacmp4/gpac/configuration.h b/src/thirdparty/gpacmp4/gpac/configuration.h deleted file mode 100644 index 181e751a..00000000 --- a/src/thirdparty/gpacmp4/gpac/configuration.h +++ /dev/null @@ -1,338 +0,0 @@ -/* - * GPAC - Multimedia Framework C SDK - * - * Authors: Jean Le Feuvre - * Copyright (c) Telecom ParisTech 2008-2012 - * All rights reserved - * - * This file is part of GPAC - * - * GPAC is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * GPAC is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - - -#ifndef _GF_CONFIG_H_ -#define _GF_CONFIG_H_ - -/*! -\addtogroup setup_grp -\brief Base data types - -This section documents the base data types of GPAC. - -@{ -*/ - -#define GPAC_CONFIGURATION "(static configuration file)" - - - -/*this file defines all common macros for libgpac compilation - except for symbian32 which uses .mmp directives ... */ - -/*Configuration for visual studio, 32/64 bits */ -#if defined(_WIN32) && !defined(_WIN32_WCE) - -#ifndef GPAC_MP4BOX_MINI - -#define GPAC_HAS_SSL - -#define GPAC_HAS_QJS -//codecs -#define GPAC_HAS_JPEG -#define GPAC_HAS_PNG -#define GPAC_HAS_LIBA52 -#define GPAC_HAS_FAAD -#define GPAC_HAS_JP2 -#define GPAC_HAS_MAD -#define GPAC_HAS_OPENHEVC -#define GPAC_HAS_OPENSVC -#define GPAC_HAS_THEORA -#define GPAC_HAS_VORBIS -#define GPAC_HAS_XVID -#define GPAC_HAS_FFMPEG -#define GPAC_HAS_DTAPI - -/*IPv6 enabled - for win32, this is evaluated at compile time, !! do not uncomment !!*/ - -#define GPAC_MEMORY_TRACKING - -/*Win32 IPv6 is evaluated at compile time, !! do not uncomment !!*/ -//#define GPAC_HAS_IPV6 - -#define GPAC_HAS_GLU - -#ifndef GPAC_CONFIG_WIN32 -#define GPAC_CONFIG_WIN32 -#endif //GPAC_CONFIG_WIN32 - - -#endif /*GPAC_MP4BOX_MINI*/ - -/*Configuration for WindowsCE 32 bits */ -#elif defined(_WIN32_WCE) - -#ifndef GPAC_FIXED_POINT -#define GPAC_FIXED_POINT -#endif - -/*use intel fixed-point*/ -//#define GPAC_USE_IGPP -/*use intel fixed-point with high precision*/ -//#define GPAC_USE_IGPP_HP - -#if defined(GPAC_USE_IGPP) && defined(GPAC_USE_IGPP_HP) -#error "Only one of GPAC_USE_IGPP and GPAC_USE_IGPP_HP can be defined" -#endif - -#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X) -#define GPAC_USE_GLES1X -#endif - - -#define GPAC_HAS_QJS -#define GPAC_HAS_JPEG -#define GPAC_HAS_PNG - -/*comment this line if you don't have a GLU32 version for Windows Mobile*/ -//#define GPAC_HAS_GLU - - -/*Configuration for Android */ -#elif defined(GPAC_CONFIG_ANDROID) - -#define GPAC_HAS_IPV6 -#define GPAC_USE_GLES1X -/*don't use fixed-point version on Android, not needed*/ -//#define GPAC_FIXED_POINT - -#define GPAC_HAS_QJS -#define GPAC_HAS_JPEG -#define GPAC_HAS_PNG - -/*Configuration for XCode OSX (not iOS) */ -#elif defined(GPAC_CONFIG_DARWIN) && !defined(GPAC_CONFIG_IOS) - -#define GPAC_HAS_IPV6 -#define GPAC_HAS_SSL -#define GPAC_HAS_SOCK_UN - -//64-bits OSX -#ifdef __LP64__ -/*! macro defined for 64-bits platforms*/ -#define GPAC_64_BITS -#endif - -#define GPAC_HAS_QJS -#define GPAC_HAS_JPEG -#define GPAC_HAS_PNG -#define GPAC_HAS_GLU - -#define GPAC_MEMORY_TRACKING - -/*Configuration for XCode iOS*/ -#elif defined(GPAC_CONFIG_DARWIN) && defined(GPAC_CONFIG_IOS) - -//64-bits iOS -#ifdef __LP64__ -/*! macro defined for 64-bits platforms*/ -#define GPAC_64_BITS -#endif - -#define GPAC_HAS_QJS -#define GPAC_HAS_JPEG -#define GPAC_HAS_PNG -#define GPAC_HAS_SOCK_UN - -/*don't use fixed-point version on iOS, not needed*/ -//#define GPAC_FIXED_POINT - -//#define GPAC_USE_GLES1X -#define GPAC_USE_GLES2 - -// glu port available in gpac extra libs -#define GPAC_HAS_GLU - -/*extra libs supported on iOS*/ -#define GPAC_HAS_FAAD -#define GPAC_HAS_MAD -#define GPAC_HAS_FFMPEG -#define GPAC_HAS_SDL -#define GPAC_HAS_FREETYPE - -#define GPAC_HAS_IPV6 -#define GPAC_HAS_SSL -#define GPAC_DISABLE_OGG - -/*Configuration for Symbian*/ -#elif defined(__SYMBIAN32__) - -#ifndef GPAC_FIXED_POINT -#define GPAC_FIXED_POINT -#endif - -#define GPAC_HAS_QJS -#define GPAC_HAS_JPEG -#define GPAC_HAS_PNG - -#else -#error "Unknown target platform used with static configuration file" -#endif - - -/*disables player */ -//#define GPAC_DISABLE_PLAYER - -/*disables scene manager */ -//#define GPAC_DISABLE_SMGR - -/*disables core tools */ -//#define GPAC_DISABLE_CORE_TOOLS - -/*disables zlib */ -#ifndef GPAC_MP4BOX_MINI -//#define GPAC_DISABLE_ZLIB -#else -#define GPAC_DISABLE_ZLIB -#endif - -/*disables SVG scene graph*/ -//#define GPAC_DISABLE_SVG - -/*disables VRML/BIFS scene graphs*/ -//#define GPAC_DISABLE_VRML - -/*disables X3D scene graphs*/ -//#define GPAC_DISABLE_X3D - -/*disables MPEG-4 OD Framework - this only minimalize the set of OD features used, however all cannot be removed -this macro is currently defined in setup.h */ -//#define GPAC_MINIMAL_ODF - -/*disables BIFS coding*/ -//#define GPAC_DISABLE_BIFS - -/*disables LASeR coder*/ -//#define GPAC_DISABLE_LASER -//#define GPAC_DISABLE_SAF - -/*disables BIFS Engine support*/ -//#define GPAC_DISABLE_SENG - -/*disables Cubic QTVR importing*/ -//#define GPAC_DISABLE_QTVR - -/*disables AVILib support*/ -//#define GPAC_DISABLE_AVILIB - -/*disables OGG support*/ -//#define GPAC_DISABLE_OGG - -/*disables MPEG2 PS support*/ -//#define GPAC_DISABLE_MPEG2PS - -/*disables MPEG2 TS demux support*/ -//#define GPAC_DISABLE_MPEG2TS - -/*disables MPEG2 TS Mux support*/ -//#define GPAC_DISABLE_MPEG2TS_MUX - -/*disables all media import functions*/ -//#define GPAC_DISABLE_MEDIA_IMPORT - -/*disable all AV parsing functions*/ -//#define GPAC_DISABLE_AV_PARSERS - -/*disables all media export functions*/ -//#define GPAC_DISABLE_MEDIA_EXPORT - -/*disables SWF importer*/ -//#define GPAC_DISABLE_SWF_IMPORT - -/*disables all media export functions*/ -//#define GPAC_DISABLE_SCENE_STATS - -/*disables scene -> MP4 encoder*/ -//#define GPAC_DISABLE_SCENE_ENCODER - -/*disables ISOM -> scene decoder*/ -//#define GPAC_DISABLE_LOADER_ISOM - -/*disables BT/WRL/X3DV -> scene decoder*/ -//#define GPAC_DISABLE_LOADER_BT - -/*disables XMTA/X3D -> scene decoder*/ -//#define GPAC_DISABLE_LOADER_XMT - -/*disables crypto tools*/ -//#define GPAC_DISABLE_CRYPTO - -/*disables all ISO FF*/ -//#define GPAC_DISABLE_ISOM - -/*disables ISO FF hint tracks*/ -//#define GPAC_DISABLE_ISOM_HINTING - -/*disables ISO FF writing*/ -//#define GPAC_DISABLE_ISOM_WRITE - -/*disables ISO FF fragments*/ -//#define GPAC_DISABLE_ISOM_FRAGMENTS - -/*disables scene graph */ -//#define GPAC_DISABLE_SCENEGRAPH - -/*disables scene graph textual dump*/ -//#define GPAC_DISABLE_SCENE_DUMP - -/*disables OD graph textual dump*/ -//#define GPAC_DISABLE_OD_DUMP - -/*disables OD graph textual dump*/ -//#define GPAC_DISABLE_ISOM_DUMP - -/*disables IETF RTP/SDP/RTSP*/ -//#define GPAC_DISABLE_STREAMING - -/*disables dashclient */ -//#define GPAC_DISABLE_DASH_CLIENT - -/*disables Timed Text support */ -//#define GPAC_DISABLE_TTXT - -/*disables TTML */ -//#define GPAC_DISABLE_TTML - -/*disables WebVTT */ -//#define GPAC_DISABLE_VTT - -/*disables DASH MPD */ -//#define GPAC_DISABLE_MPD - -/*disables HEVC */ -//#define GPAC_DISABLE_HEVC - -/*disables AOM AV1 */ -//#define GPAC_DISABLE_AV1 - -/*disables VOBSUB */ -//#define GPAC_DISABLE_VOBSUB - - -/*! @} */ - -#endif /*_GF_CONFIG_H_*/ - diff --git a/windows/ccextractor.vcxproj b/windows/ccextractor.vcxproj index dbec447e..7e208b28 100644 --- a/windows/ccextractor.vcxproj +++ b/windows/ccextractor.vcxproj @@ -451,7 +451,7 @@ Disabled ..\src\thirdparty\freetype\include;..\src\thirdparty\win_spec_incld;..\src\lib_ccx;..\src\thirdparty\lib_hash;..\src\lib_ccx\zvbi;..\src\thirdparty\protobuf-c;..\src\thirdparty\gpacmp4;..\src\thirdparty\win_iconv;..\src\thirdparty\zlib;..\src\thirdparty\libpng;..\src\thirdparty;..\src;libs\include;%(AdditionalIncludeDirectories) - WIN32;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;_DEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_WARNINGS;GPAC_DISABLE_REMOTERY;GPAC_DISABLE_ZLIB;%(PreprocessorDefinitions) + WIN32;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;_DEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_WARNINGS;GPAC_DISABLE_REMOTERY;GPAC_DISABLE_ZLIB;GPAC_HAVE_CONFIG_H;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -484,7 +484,7 @@ xcopy /y "$(ProjectDir)libs\lib\ffmpeg-lib\swscale-4.dll" "$(ProjectDir)$(OutDir Disabled ../src/thirdparty/protobuf-c;../src/thirdparty/win_spec_incld;../src/thirdparty/gpacmp4;../src/thirdparty/libpng;../src/thirdparty/zlib;../src;../src/lib_ccx;../src/lib_ccx/zvbi;../src/thirdparty;%(AdditionalIncludeDirectories) - WIN32;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;_DEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;GPAC_DISABLE_REMOTERY;GPAC_DISABLE_ZLIB;%(PreprocessorDefinitions) + WIN32;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;_DEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;GPAC_DISABLE_REMOTERY;GPAC_DISABLE_ZLIB;GPAC_HAVE_CONFIG_H;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -503,7 +503,7 @@ xcopy /y "$(ProjectDir)libs\lib\ffmpeg-lib\swscale-4.dll" "$(ProjectDir)$(OutDir Disabled ..\src\thirdparty\freetype\include;..\src\thirdparty\win_spec_incld;..\src\lib_ccx;..\src\thirdparty\lib_hash;..\src\lib_ccx\zvbi;..\src\thirdparty\protobuf-c;..\src\thirdparty\gpacmp4;..\src\thirdparty\win_iconv;..\src\thirdparty\zlib;..\src\thirdparty\;..\src\thirdparty\libpng;..\src;libs\include;%(AdditionalIncludeDirectories) - SEGMENT_BY_FILE_TIME;ENABLE_HARDSUBX;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;ENABLE_OCR;WIN32;_DEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;GPAC_DISABLE_REMOTERY;GPAC_DISABLE_ZLIB;%(PreprocessorDefinitions) + SEGMENT_BY_FILE_TIME;ENABLE_HARDSUBX;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;ENABLE_OCR;WIN32;_DEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;GPAC_DISABLE_REMOTERY;GPAC_DISABLE_ZLIB;GPAC_HAVE_CONFIG_H;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebug @@ -541,7 +541,7 @@ xcopy /y "$(ProjectDir)libs\lib\ffmpeg-lib\swscale-4.dll" "$(ProjectDir)$(OutDir Disabled ../src/thirdparty/protobuf-c;../src/thirdparty/win_spec_incld;../src/thirdparty/gpacmp4;../src/thirdparty/libpng;../src/thirdparty/zlib;../src;../src/lib_ccx;../src/lib_ccx/zvbi;../src/thirdparty;%(AdditionalIncludeDirectories) - ENABLE_OCR;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;WIN32;_DEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;GPAC_DISABLE_REMOTERY;GPAC_DISABLE_ZLIB;%(PreprocessorDefinitions) + ENABLE_OCR;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;WIN32;_DEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;GPAC_DISABLE_REMOTERY;GPAC_DISABLE_ZLIB;GPAC_HAVE_CONFIG_H;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -564,7 +564,7 @@ xcopy /y "$(ProjectDir)libs\lib\libtesseract304d.dll" "$(ProjectDir)$(OutDir)" MaxSpeed ..\src\thirdparty\freetype\include;..\src\thirdparty\win_spec_incld;..\src\lib_ccx;..\src\thirdparty\lib_hash;..\src\lib_ccx\zvbi;..\src\thirdparty\protobuf-c;..\src\thirdparty\gpacmp4;..\src\thirdparty\win_iconv;..\src\thirdparty\zlib;..\src\thirdparty\;..\src\thirdparty\libpng;..\src;libs\include;%(AdditionalIncludeDirectories) - ENABLE_HARDSUBX;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;VERSION_FILE_PRESENT;ENABLE_OCR;WIN32;NDEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;GPAC_DISABLE_REMOTERY;GPAC_DISABLE_ZLIB;%(PreprocessorDefinitions) + ENABLE_HARDSUBX;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;VERSION_FILE_PRESENT;ENABLE_OCR;WIN32;NDEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;GPAC_DISABLE_REMOTERY;GPAC_DISABLE_ZLIB;GPAC_HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreaded NotUsing TurnOffAllWarnings @@ -601,7 +601,7 @@ xcopy /y "$(ProjectDir)libs\lib\ffmpeg-lib\swscale-4.dll" "$(ProjectDir)$(OutDir Disabled ../src/thirdparty/protobuf-c;../src/thirdparty/win_spec_incld;../src/thirdparty/gpacmp4;../src/thirdparty/libpng;../src/thirdparty/zlib;../src;../src/lib_ccx;../src/lib_ccx/zvbi;../src/thirdparty;%(AdditionalIncludeDirectories) - VERSION_FILE_PRESENT;ENABLE_OCR;WIN32;NDEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;GPAC_DISABLE_REMOTERY;GPAC_DISABLE_ZLIB;%(PreprocessorDefinitions) + VERSION_FILE_PRESENT;ENABLE_OCR;WIN32;NDEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;GPAC_DISABLE_REMOTERY;GPAC_DISABLE_ZLIB;GPAC_HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -623,7 +623,7 @@ xcopy /y "$(ProjectDir)libs\lib\libtesseract304d.dll" "$(ProjectDir)$(OutDir)" ..\src\thirdparty\freetype\include;..\src\thirdparty\win_spec_incld;..\src\lib_ccx;..\src\thirdparty\lib_hash;..\src\lib_ccx\zvbi;..\src\thirdparty\protobuf-c;..\src\thirdparty\gpacmp4;..\src\thirdparty\win_iconv;..\src\thirdparty\zlib;..\src\thirdparty\libpng;..\src\thirdparty;..\src;libs\include;%(AdditionalIncludeDirectories) - VERSION_FILE_PRESENT;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;WIN32;NDEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;GPAC_DISABLE_REMOTERY;GPAC_DISABLE_ZLIB;%(PreprocessorDefinitions) + VERSION_FILE_PRESENT;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;WIN32;NDEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;GPAC_DISABLE_REMOTERY;GPAC_DISABLE_ZLIB;GPAC_HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreaded Level3 @@ -655,7 +655,7 @@ xcopy /y "$(ProjectDir)libs\lib\ffmpeg-lib\swscale-4.dll" "$(ProjectDir)$(OutDir ..\src\thirdparty\freetype\include;../src/thirdparty/protobuf-c;../src/thirdparty/win_spec_incld;../src/lib_ccx;../src/thirdparty/lib_hash;../src/thirdparty/gpacmp4;../src/thirdparty/libpng;../src/thirdparty/zlib;../src/lib_ccx/zvbi;../src/thirdparty;%(AdditionalIncludeDirectories) - VERSION_FILE_PRESENT;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;WIN32;NDEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;GPAC_DISABLE_REMOTERY;GPAC_DISABLE_ZLIB;%(PreprocessorDefinitions) + VERSION_FILE_PRESENT;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;WIN32;NDEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;GPAC_DISABLE_REMOTERY;GPAC_DISABLE_ZLIB;GPAC_HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreadedDLL