mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bean linking on wntgccx

Browse Source 
Change-Id: I8d5d62be630f85e9a807dc108baca8be2930224e
This commit is contained in:
Fridrich Štrba
2013-06-07 13:43:22 +02:00
parent 8e784b59f1
commit abd89db2a9
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
View File

@@ -25,7 +25,6 @@
#pragma warning(pop) #pragma warning(pop)
#endif #endif
#include <windows.h>
#define JAWT_GetAWT hidden_JAWT_GetAWT #define JAWT_GetAWT hidden_JAWT_GetAWT
#include "jawt.h" #include "jawt.h"
#undef JAWT_GetAWT #undef JAWT_GetAWT
@@ -51,7 +50,7 @@ typedef struct jawt_Win32DrawingSurfaceInfo {
HPALETTE hpalette; HPALETTE hpalette;
} JAWT_Win32DrawingSurfaceInfo; } JAWT_Win32DrawingSurfaceInfo;
extern __declspec(dllimport) unsigned char __stdcall JAWT_GetAWT(JNIEnv *, JAWT *); JNIIMPORT unsigned char JNICALL JAWT_GetAWT(JNIEnv *, JAWT *);
#if defined _MSC_VER #if defined _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#endif #endif
@@ -157,7 +156,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative
SetProp( hWnd, OLD_PROC_KEY, (HANDLE)hFuncPtr ); SetProp( hWnd, OLD_PROC_KEY, (HANDLE)hFuncPtr );
} }
return ((jlong)(LONG)hWnd); return ((jlong)hWnd);
} }

7
external/CustomTarget_jawt.mk vendored
View File

@@ -14,10 +14,17 @@ $(eval $(call gb_CustomTarget_register_targets,external/jawt,\
libjawt.dll.a \ libjawt.dll.a \
)) ))
ifeq ($(OS)$(CPU),WNTX)
$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def:
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
echo EXPORTS > $@
echo "JAWT_GetAWT" >> $@
else
$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def: $(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def:
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
echo EXPORTS > $@ echo EXPORTS > $@
echo "JAWT_GetAWT@8" >> $@ echo "JAWT_GetAWT@8" >> $@
endif
$(call gb_CustomTarget_get_workdir,external/jawt)/libjawt.dll.a: $(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def $(call gb_CustomTarget_get_workdir,external/jawt)/libjawt.dll.a: $(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DLT,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DLT,1)

2
include/wntgccx/jni_md.h
View File

@@ -24,7 +24,7 @@
#define JNIEXPORT __declspec (dllexport) #define JNIEXPORT __declspec (dllexport)
#define JNIIMPORT __declspec (dllimport) #define JNIIMPORT __declspec (dllimport)
#define JNICALL __stdcall #define JNICALL
typedef long jint; typedef long jint;
typedef __int64 jlong; typedef __int64 jlong;