Skip to content

MinGW building fixed #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mstrap wants to merge 1 commit into
base: main
Choose a base branch
from
Open

MinGW building fixed #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/main/native/libjagged/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ ELSE ()
IF (WIN32 AND NOT CYGWIN)
SET(CMAKE_C_FLAGS_DEBUG "-D_DEBUG")
ENDIF ()

IF (MINGW)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--add-stdcall-alias")
SET(CMAKE_SHARED_LIBRARY_PREFIX "")
ENDIF ()
ENDIF()

FILE(GLOB SRC_H *.h)
Expand Down
11 changes: 8 additions & 3 deletions src/main/native/libjagged/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,14 @@

#ifdef _WIN32
typedef WCHAR native_char;

typedef SSIZE_T ssize_t;
#else
typedef char native_char;
#endif

#if defined(GIT_WIN32) && !defined(__MINGW32__)
typedef SSIZE_T ssize_t;
#endif

GIT_INLINE(jstring) git_java_utf8_to_jstring(
JNIEnv *env,
const char *utf8str)
Expand All @@ -51,7 +53,7 @@ GIT_INLINE(jstring) git_java_native_to_jstring(
JNIEnv *env,
const native_char *nativestr)
{
#if defined(_WIN32)
#if defined(GIT_WIN32) && !defined(__MINGW32__)
size_t len;

if (FAILED(StringCchLength(nativestr, STRSAFE_MAX_CCH, &len)))
Expand All @@ -65,6 +67,9 @@ GIT_INLINE(jstring) git_java_native_to_jstring(
* always be less than INT_MAX"
*/
return (*env)->NewString(env, nativestr, (jsize) len);
#elif defined(_WIN32)
size_t len = wcslen(nativestr);
return (*env)->NewString(env, nativestr, (jsize) len);
#else
return (*env)->NewStringUTF(env, nativestr);
#endif
Expand Down
5 changes: 5 additions & 0 deletions src/test/native/libjagged_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ ELSE ()
IF (WIN32 AND NOT CYGWIN)
SET(CMAKE_C_FLAGS_DEBUG "-D_DEBUG")
ENDIF ()

IF (MINGW)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--add-stdcall-alias")
SET(CMAKE_SHARED_LIBRARY_PREFIX "")
ENDIF ()
ENDIF()

FILE(GLOB SRC_H *.h)
Expand Down