Skip to content

Commit 731f125

Browse files
committed
things
1 parent dbdace1 commit 731f125

4 files changed

Lines changed: 49 additions & 8 deletions

File tree

CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ file(GLOB SOURCES src/*.c)
55

66
add_library(dtc STATIC ${SOURCES})
77

8-
option(DECTALKMINI_NO_FILESYSTEM "No filesystem" OFF)
8+
option(DECTALKMINI_NO_FILESYSTEM "Disable filesystem" OFF)
9+
option(DECTALKMINI_NO_CHARSET "Disable charset conversion" OFF)
910
option(DECTALKMINI_EXAMPLES "Build examples" ON)
1011

1112
target_include_directories(dtc PUBLIC include)
@@ -33,6 +34,10 @@ if(DECTALKMINI_NO_FILESYSTEM)
3334
target_compile_definitions(dtc PRIVATE "NO_FILESYSTEM")
3435
endif()
3536

37+
if(DECTALKMINI_NO_CHARSET)
38+
target_compile_definitions(dtc PRIVATE "NO_CHARSET")
39+
endif()
40+
3641
if(DECTALKMINI_EXAMPLES)
3742
add_executable(say main.c)
3843
target_include_directories(say PRIVATE include)

CMakeLists.txt~

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
cmake_minimum_required(VERSION 3.25)
2+
project(dectalkmini)
3+
4+
file(GLOB SOURCES src/*.c)
5+
6+
add_library(dtc STATIC ${SOURCES})
7+
8+
option(DECTALKMINI_NO_FILESYSTEM "No filesystem" OFF)
9+
option(DECTALKMINI_EXAMPLES "Build examples" ON)
10+
11+
target_include_directories(dtc PUBLIC include)
12+
target_compile_definitions(
13+
dtc PRIVATE
14+
"_REENTRANT"
15+
"NOMME"
16+
"LTSSIM"
17+
"TTSSIM"
18+
"ANSI"
19+
"BLD_DECTALK_DLL"
20+
"ENGLISH"
21+
"ENGLISH_US"
22+
"ACCESS32"
23+
"TYPING_MODE"
24+
"ACNA"
25+
"DISABLE_AUDIO"
26+
"SINGLE_THREADED"
27+
)
28+
if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
29+
target_link_libraries(dtc PRIVATE m)
30+
endif()
31+
32+
if(DECTALKMINI_NO_FILESYSTEM)
33+
target_compile_definitions(dtc PRIVATE "NO_FILESYSTEM")
34+
endif()
35+
36+
if(DECTALKMINI_EXAMPLES)
37+
add_executable(say main.c)
38+
target_include_directories(say PRIVATE include)
39+
target_link_libraries(say PRIVATE dtc)
40+
endif()

include/epsonapi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
DT_EXTERN int TextToSpeechStart(char *input,short *buffer_deprecated,int output_format);
3333
DT_EXTERN int TextToSpeechInit(short *(*callback)(short *,long, int),void *user_dict);
3434
DT_EXTERN int TextToSpeechReset(void);
35-
DT_EXTERN int TextToSpeechSync();
35+
DT_EXTERN int TextToSpeechSync(void);
3636
DT_EXTERN int TextToSpeechChangeVoice(const char *cvoice);
3737
DT_EXTERN void TextToSpeechSetRate(int rate);
3838
DT_EXTERN int TextToSpeechSetVoiceParam(const char *cmd, int value);

src/charset.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define USE_ICONV
1010
#define REALLOC_SIZE 4096
1111

12-
#if defined(__unix__) && defined(USE_ICONV)
12+
#if defined(__unix__) && defined(USE_ICONV) && !defined(NO_CHARSET)
1313
/* unix */
1414
#include <langinfo.h>
1515
#include <iconv.h>
@@ -78,9 +78,7 @@ char *convert_string_for_dapi(char *in, size_t inlen) {
7878
return out;
7979
}
8080

81-
#else
82-
83-
#if defined(_WIN32)
81+
#elif defined(_WIN32) && !defined(NO_CHARSET)
8482
/* win32 */
8583
#include <windows.h>
8684
#include <wchar.h>
@@ -125,5 +123,3 @@ char *convert_string_for_dapi(char *in, size_t inlen) {
125123
#endif
126124

127125
#endif
128-
129-
#endif

0 commit comments

Comments
 (0)