jamosdev
/
rhubarb-lip-sync
mirror of https://github.com/DanielSWolf/rhubarb-lip-sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Saving my changes to Sphinx as patch files

This commit is contained in:
Daniel Wolf 2016-01-12 22:13:42 +01:00
parent eace5dbd1b
commit e55cbd3bcf
7 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -57,14 +57,14 @@ target_compile_options(cppFormat PRIVATE ${disableWarningsFlags})
set_target_properties(cppFormat PROPERTIES FOLDER lib) set_target_properties(cppFormat PROPERTIES FOLDER lib)
# ... sphinxbase # ... sphinxbase
include_directories(SYSTEM "lib/sphinxbase-redefine/include" "lib/sphinxbase-5prealpha-2015-08-05/include") include_directories(SYSTEM "lib/sphinxbase-5prealpha-2015-08-05/include")
FILE(GLOB_RECURSE sphinxbaseFiles "lib/sphinxbase-5prealpha-2015-08-05/src/libsphinxbase/*.c") FILE(GLOB_RECURSE sphinxbaseFiles "lib/sphinxbase-5prealpha-2015-08-05/src/libsphinxbase/*.c")
add_library(sphinxbase ${sphinxbaseFiles}) add_library(sphinxbase ${sphinxbaseFiles})
target_compile_options(sphinxbase PRIVATE ${disableWarningsFlags}) target_compile_options(sphinxbase PRIVATE ${disableWarningsFlags})
set_target_properties(sphinxbase PROPERTIES FOLDER lib) set_target_properties(sphinxbase PROPERTIES FOLDER lib)
# ... PocketSphinx # ... PocketSphinx
include_directories(SYSTEM "lib/pocketsphinx-redefine/include" "lib/pocketsphinx-5prealpha-2015-08-05/include") include_directories(SYSTEM "lib/pocketsphinx-5prealpha-2015-08-05/include")
FILE(GLOB pocketSphinxFiles "lib/pocketsphinx-5prealpha-2015-08-05/src/libpocketsphinx/*.c") FILE(GLOB pocketSphinxFiles "lib/pocketsphinx-5prealpha-2015-08-05/src/libpocketsphinx/*.c")
add_library(pocketSphinx ${pocketSphinxFiles}) add_library(pocketSphinx ${pocketSphinxFiles})
target_link_libraries(pocketSphinx sphinxbase) target_link_libraries(pocketSphinx sphinxbase)

10
lib/pocketsphinx-5prealpha-2015-08-05/include/pocketsphinx_export.h
View File

@ -1,15 +1,7 @@
#ifndef __POCKETSPHINX_EXPORT_H__ #ifndef __POCKETSPHINX_EXPORT_H__
#define __POCKETSPHINX_EXPORT_H__ #define __POCKETSPHINX_EXPORT_H__
/* Win32/WinCE DLL gunk */ // We're creating a static library. No __declspec!
#if (defined(_WIN32) || defined(_WIN32_WCE)) && !defined(_WIN32_WP) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__WINSCW__) && !defined(__SYMBIAN32__)
#ifdef POCKETSPHINX_EXPORTS /* Visual Studio */
#define POCKETSPHINX_EXPORT __declspec(dllexport)
#else
#define POCKETSPHINX_EXPORT __declspec(dllimport)
#endif
#else /* !_WIN32 */
#define POCKETSPHINX_EXPORT #define POCKETSPHINX_EXPORT
#endif
#endif /* __POCKETSPHINX_EXPORT_H__ */ #endif /* __POCKETSPHINX_EXPORT_H__ */

7
lib/pocketsphinx-redefine/include/pocketsphinx_export.h
View File

@ -1,7 +0,0 @@
#ifndef __POCKETSPHINX_EXPORT_H__
#define __POCKETSPHINX_EXPORT_H__
// We're creating a static library. No __declspec!
#define POCKETSPHINX_EXPORT
#endif /* __POCKETSPHINX_EXPORT_H__ */

21
lib/pocketsphinx.patch Normal file
View File

@ -0,0 +1,21 @@
diff --git a/lib/pocketsphinx-5prealpha-2015-08-05/include/pocketsphinx_export.h b/lib/pocketsphinx-5prealpha-2015-08-05/include/pocketsphinx_export.h
index 4e76f62..a82acd6 100644
--- a/lib/pocketsphinx-5prealpha-2015-08-05/include/pocketsphinx_export.h
+++ b/lib/pocketsphinx-5prealpha-2015-08-05/include/pocketsphinx_export.h
@@ -1,15 +1,7 @@
#ifndef __POCKETSPHINX_EXPORT_H__
#define __POCKETSPHINX_EXPORT_H__
-/* Win32/WinCE DLL gunk */
-#if (defined(_WIN32) || defined(_WIN32_WCE)) && !defined(_WIN32_WP) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__WINSCW__) && !defined(__SYMBIAN32__)
-#ifdef POCKETSPHINX_EXPORTS /* Visual Studio */
-#define POCKETSPHINX_EXPORT __declspec(dllexport)
-#else
-#define POCKETSPHINX_EXPORT __declspec(dllimport)
-#endif
-#else /* !_WIN32 */
+// We're creating a static library. No __declspec!
#define POCKETSPHINX_EXPORT
-#endif
#endif /* __POCKETSPHINX_EXPORT_H__ */

10
lib/sphinxbase-5prealpha-2015-08-05/include/sphinxbase/sphinxbase_export.h
View File

@ -1,15 +1,7 @@
#ifndef __SPHINXBASE_EXPORT_H__ #ifndef __SPHINXBASE_EXPORT_H__
#define __SPHINXBASE_EXPORT_H__ #define __SPHINXBASE_EXPORT_H__
/* Win32/WinCE DLL gunk */ // We're creating a static library. No __declspec!
#if (defined(_WIN32) || defined(_WIN32_WCE)) && !defined(_WIN32_WP) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__WINSCW__) && !defined(__SYMBIAN32__)
#if defined(SPHINXBASE_EXPORTS) /* Visual Studio */
#define SPHINXBASE_EXPORT __declspec(dllexport)
#else
#define SPHINXBASE_EXPORT __declspec(dllimport)
#endif
#else /* !_WIN32 */
#define SPHINXBASE_EXPORT #define SPHINXBASE_EXPORT
#endif
#endif /* __SPHINXBASE_EXPORT_H__ */ #endif /* __SPHINXBASE_EXPORT_H__ */

7
lib/sphinxbase-redefine/include/sphinxbase/sphinxbase_export.h
View File

@ -1,7 +0,0 @@
#ifndef __SPHINXBASE_EXPORT_H__
#define __SPHINXBASE_EXPORT_H__
// We're creating a static library. No __declspec!
#define SPHINXBASE_EXPORT
#endif /* __SPHINXBASE_EXPORT_H__ */

21
lib/sphinxbase.patch Normal file
View File

@ -0,0 +1,21 @@
diff --git a/lib/sphinxbase-5prealpha-2015-08-05/include/sphinxbase/sphinxbase_export.h b/lib/sphinxbase-5prealpha-2015-08-05/include/sphinxbase/sphinxbase_export.h
index 535d460..da4d633 100644
--- a/lib/sphinxbase-5prealpha-2015-08-05/include/sphinxbase/sphinxbase_export.h
+++ b/lib/sphinxbase-5prealpha-2015-08-05/include/sphinxbase/sphinxbase_export.h
@@ -1,15 +1,7 @@
#ifndef __SPHINXBASE_EXPORT_H__
#define __SPHINXBASE_EXPORT_H__
-/* Win32/WinCE DLL gunk */
-#if (defined(_WIN32) || defined(_WIN32_WCE)) && !defined(_WIN32_WP) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__WINSCW__) && !defined(__SYMBIAN32__)
-#if defined(SPHINXBASE_EXPORTS) /* Visual Studio */
-#define SPHINXBASE_EXPORT __declspec(dllexport)
-#else
-#define SPHINXBASE_EXPORT __declspec(dllimport)
-#endif
-#else /* !_WIN32 */
+// We're creating a static library. No __declspec!
#define SPHINXBASE_EXPORT
-#endif
#endif /* __SPHINXBASE_EXPORT_H__ */