TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile errors

Browse Source
This commit is contained in:
rdb 2017-11-24 22:33:49 +01:00
parent d755de849c
commit 409b241b40
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/showutil/FreezeTool.py
View File

@ -1830,7 +1830,7 @@ class Freezer:
elif data[:4] in (b'\xFE\xED\xFA\xCE', b'\xCE\xFA\xED\xFE', elif data[:4] in (b'\xFE\xED\xFA\xCE', b'\xCE\xFA\xED\xFE',
b'\xFE\xED\xFA\xCF', b'\xCF\xFA\xED\xFE'): b'\xFE\xED\xFA\xCF', b'\xCF\xFA\xED\xFE'):
off = self._find_symbol_macho(macho_data, symbol_name) off = self._find_symbol_macho(data, symbol_name)
if off is not None: if off is not None:
data[off:off+len(replacement)] = replacement data[off:off+len(replacement)] = replacement
return True return True

4
dtool/src/prc/configPageManager.cxx
View File

@ -117,8 +117,10 @@ reload_implicit_pages() {
}; };
#ifdef _MSC_VER #ifdef _MSC_VER
const BlobInfo *blobinfo = (const BlobInfo *)GetProcAddress(GetModuleHandle(NULL), "blobinfo"); const BlobInfo *blobinfo = (const BlobInfo *)GetProcAddress(GetModuleHandle(NULL), "blobinfo");
#else #elif defined(RTLD_SELF)
const BlobInfo *blobinfo = (const BlobInfo *)dlsym(RTLD_SELF, "blobinfo"); const BlobInfo *blobinfo = (const BlobInfo *)dlsym(RTLD_SELF, "blobinfo");
#else
const BlobInfo *blobinfo = (const BlobInfo *)dlsym(dlopen(NULL, RTLD_NOW), "blobinfo");
#endif #endif
if (blobinfo != nullptr && (blobinfo->version == 0 || blobinfo->num_pointers < 10)) { if (blobinfo != nullptr && (blobinfo->version == 0 || blobinfo->num_pointers < 10)) {
blobinfo = nullptr; blobinfo = nullptr;

6
pandatool/src/deploy-stub/deploy-stub.c
View File

@ -362,9 +362,9 @@ int main(int argc, char *argv[]) {
} }
#ifdef _WIN32 #ifdef _WIN32
if (codepage != 0) { if (blobinfo.codepage != 0) {
SetConsoleCP(codepage); SetConsoleCP(blobinfo.codepage);
SetConsoleOutputCP(codepage); SetConsoleOutputCP(blobinfo.codepage);
} }
#endif #endif