erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-05 00:15:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

chore(developer): fixup build errors

Browse source
This commit is contained in:
Marc Durdin 2023-03-09 11:34:14 +07:00
parent e10606f6c1
commit 6a280804b8
5 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
developer/src/kmcmplib/Makefile
View file

@ -16,10 +16,10 @@ BUILD_DEBUG=
!endif
build: .virtual
$(CALLER) ./build.sh clean:x86 configure:x86 build:x86 clean:x64 configure:x64 build:x64 $(BUILD_DEBUG)
$(CALLER) ./build.sh clean configure build $(BUILD_DEBUG)
clean:
$(CALLER) ./build.sh clean:x86 clean:x64
$(CALLER) ./build.sh clean $(BUILD_DEBUG)
signcode:
@rem Not required
@ -30,6 +30,9 @@ wrap-symbols:
test-manifest:
@rem This target needed as dependency for TIKE and KMCMPDLL
test:
$(CALLER) ./build.sh test $(BUILD_DEBUG)
install:
@rem Not required

4
developer/src/kmcmplib/src/CheckFilenameConsistency.cpp
View file

@ -81,8 +81,8 @@ KMX_DWORD CheckFilenameConsistency(KMX_WCHAR const * Filename, bool ReportMissin
if(!kmcmp_FileExists(Name)) {
if (ReportMissingFile) {
u16cpy(ErrExtraW, u"referenced file '");
u16ncat(ErrExtraW, 256, FileName);
u16ncat(ErrExtraW, 256, u"'");
u16ncat(ErrExtraW, Filename, 256);
u16ncat(ErrExtraW, u"'", 256);
strcpy(ErrExtraLIB, string_from_u16string(ErrExtraW).c_str());
AddWarning(CWARN_MissingFile);
}

19
developer/src/kmcmplib/src/filesystem.cpp
View file

@ -162,4 +162,21 @@ KMX_BOOL kmcmp_FileExists(const KMX_CHAR *filename) {
#endif // !_MSC_VER
return FALSE;
}
}
KMX_BOOL kmcmp_FileExists(const KMX_WCHAR* filename) {
#ifdef _MSC_VER
intptr_t n;
_wfinddata_t fi;
if((n = _wfindfirst((wchar_t*) filename, &fi)) != -1) {
_findclose(n);
return TRUE;
}
#else
std::string cpath;
cpath = string_from_u16string(filename);
return kmcmp_FileExists(cpath.c_str());
#endif
return FALSE;
};

1
developer/src/kmcmplib/src/filesystem.h
View file

@ -17,3 +17,4 @@ FILE* Open_File(const KMX_CHAR* Filename, const KMX_CHAR* mode);
FILE* Open_File(const KMX_WCHART* Filename, const KMX_WCHART* mode);
FILE* Open_File(const KMX_WCHAR* Filename, const KMX_WCHAR* mode);
KMX_BOOL kmcmp_FileExists(const KMX_CHAR *filename);
KMX_BOOL kmcmp_FileExists(const KMX_WCHAR *filename);

1
developer/src/kmcmplib/src/kmx_u16.cpp
View file

@ -7,6 +7,7 @@
#include <km_types.h>
#include <kmx_file.h>
#include <codecvt>
#include <locale>
#include <stdarg.h>
//String <- wstring