Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 10:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Build fixes

Browse Source
This commit is contained in:
Kovid Goyal 2020-05-01 19:52:52 +05:30
parent fb1b0162fa
commit 8cbda9e18a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
5 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bypy/macos/util.c
View File

@ -32,7 +32,6 @@ get_paths(char *path) {
for (unsigned i = 0; i < 3; i++) {
char *t = rindex(path, '/');
if (t == NULL) fatal("Failed to determine bundle path.");
>>>>>>> The Apple build is working
*t = '\0';
}
if (strstr(path, "/calibre.app/Contents/") != NULL) {

2
setup/extensions.json
View File

@ -75,7 +75,7 @@
"name": "lzx",
"sources": "calibre/utils/lzx/lzxmodule.c calibre/utils/lzx/compressor.c calibre/utils/lzx/lzxd.c calibre/utils/lzx/lzc.c calibre/utils/lzx/lzxc.c",
"inc_dirs": "calibre/utils/lzx",
"headers": "calibre/utils/lzx/lzc.h calibre/utils/lzx/lzxmodule.h calibre/utils/lzx/system.h calibre/utils/lzx/lzxc.h calibre/utils/lzx/lzxd.h calibre/utils/lzx/mspack.h"
"headers": "calibre/utils/lzx/lzc.h calibre/utils/lzx/system.h calibre/utils/lzx/lzxc.h calibre/utils/lzx/lzxd.h calibre/utils/lzx/mspack.h"
},
{
"name": "freetype",

4
src/calibre/utils/lzx/compressor.c
View File

@ -7,7 +7,9 @@
#include <Python.h>
#include <structmember.h>
#include <lzxc.h>
#include <lzxmodule.h>
extern PyObject *LZXError;
extern PyTypeObject CompressorType;
#define BUFFER_INIT(buffer) \
do { \

3
src/calibre/utils/lzx/lzxmodule.c
View File

@ -9,7 +9,8 @@
#include <mspack.h>
#include <lzxd.h>
#include <lzxmodule.h>
extern PyObject *LZXError;
extern PyTypeObject CompressorType;
static char lzx_doc[] =
"Provide basic LZX compression and decompression using the code from\n"

12
src/calibre/utils/lzx/lzxmodule.h
View File

@ -1,12 +0,0 @@
/* __license__ = 'GPL v3'
* __copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
*
* Common declarations for Python module C glue code.
*/
#pragma once
#include <Python.h>
extern PyObject *LZXError;
extern PyTypeObject CompressorType;