third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wmain: build as c++ instead of c

Browse Source 
Allows to keep exiv2 c++ only.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2023-01-03 15:23:02 -08:00
parent ce2eb6daad
commit a84df11bbb
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/CMakeLists.txt
View File

@ -28,7 +28,7 @@ target_link_libraries(exiv2 PRIVATE std::filesystem)
if(MSVC OR MINGW) if(MSVC OR MINGW)
# Trick to get properly UTF-8 encoded argv # Trick to get properly UTF-8 encoded argv
# More info at: https://github.com/huangqinjin/wmain # More info at: https://github.com/huangqinjin/wmain
add_library(wmain STATIC wmain.c) add_library(wmain STATIC wmain.cpp)
target_link_libraries(exiv2 PRIVATE wmain) target_link_libraries(exiv2 PRIVATE wmain)
endif() endif()

14
app/wmain.c → app/wmain.cpp
View File

@ -2,23 +2,23 @@
#include <windows.h> #include <windows.h>
extern int __cdecl main(); extern int __cdecl main(int, char*[]);
int wmain(int argc, wchar_t* argv[]) { int wmain(int argc, wchar_t* argv[]) {
char** args; char** args;
int nbytes = (int)(sizeof(char*) * (argc + 1)); int nbytes = static_cast<int>(sizeof(char*) * (argc + 1));
HANDLE heap = GetProcessHeap(); HANDLE heap = GetProcessHeap();
for (int i = 0; i < argc; ++i) for (int i = 0; i < argc; ++i)
nbytes += WideCharToMultiByte(CP_UTF8, 0, argv[i], -1, NULL, 0, NULL, NULL); nbytes += WideCharToMultiByte(CP_UTF8, 0, argv[i], -1, nullptr, 0, nullptr, nullptr);
args = HeapAlloc(heap, 0, nbytes); args = reinterpret_cast<char**>(HeapAlloc(heap, 0, nbytes));
args[0] = (char*)(args + argc + 1); args[0] = reinterpret_cast<char*>(args + argc + 1);
for (int i = 0; i < argc; ++i) for (int i = 0; i < argc; ++i)
args[i + 1] = args[i] + WideCharToMultiByte(CP_UTF8, 0, argv[i], -1, args[i], nbytes, NULL, NULL); args[i + 1] = args[i] + WideCharToMultiByte(CP_UTF8, 0, argv[i], -1, args[i], nbytes, nullptr, nullptr);
args[argc] = NULL; args[argc] = nullptr;
argc = main(argc, args); argc = main(argc, args);
HeapFree(heap, 0, args); HeapFree(heap, 0, args);