@@ -59,9 +59,12 @@ JAVA_INCLUDES=-I"$(JAVA_HOME)/include" \
59
59
BUILD =../build/native
60
60
JAVAH =$(BUILD )
61
61
INSTALLDIR =../build/$(OS )
62
- JNIDISPATCH_OBJS =$(BUILD ) /dispatch.o $(BUILD ) /callback.o $(EXTRAOBJS )
62
+ # #fixme!!
63
+ JNIDISPATCH_OBJS =$(BUILD ) /dispatch.o $(EXTRAOBJS )
64
+ # JNIDISPATCH_OBJS=$(BUILD)/dispatch.o $(BUILD)/callback.o $(EXTRAOBJS)
63
65
RSRC =$(BUILD ) /rsrc.o
64
66
DLLCB =$(BUILD ) /dll-callback.o
67
+ FAUXCB =$(BUILD ) /callback.o
65
68
ifneq ($(DYNAMIC_LIBFFI ) ,true)
66
69
FFI_SRC =$(shell pwd) /libffi
67
70
FFI_BUILD =$(BUILD ) /libffi
@@ -228,7 +231,9 @@ FFI_CONFIG+=--host=i686-w64-mingw32
228
231
MINGW_PREFIX? =i686-w64-mingw32-
229
232
endif
230
233
# Need windres from mingw distribution, even if building with MSVC
231
- WINDRES =$(MINGW_PREFIX ) windres
234
+ # ### disable windres for arm64
235
+ # WINDRES=$(MINGW_PREFIX)windres
236
+ WINDRES =false
232
237
MINGW =$(MINGW_PREFIX ) gcc
233
238
234
239
ifeq ($(USE_MSVC ) ,true)
@@ -246,11 +251,16 @@ LIBS=psapi.lib
246
251
ARSFX =.lib
247
252
ifeq ($(ARCH ) ,amd64)
248
253
# fixme!!!!
254
+ # CC+= =m64
249
255
CC+ = -marm64
250
256
endif
251
- FFI_CONFIG+ = && rm -f include/ffitarget.h && cp $(FFI_SRC ) /include/*.h $(FFI_SRC ) /src/x86/ffitarget.h include
257
+ # fixme!!!!
258
+ FFI_CONFIG+=--host =aarch64-cygwin
259
+ # FFI_CONFIG+= && rm -f include/ffitarget.h && cp $(FFI_SRC)/include/*.h $(FFI_SRC)/src/x86/ffitarget.h include
260
+ FFI_CONFIG+ = && rm -f include/ffitarget.h && cp $(FFI_SRC ) /include/*.h $(FFI_SRC ) /src/aarch64/ffitarget.h include
252
261
FFI_ENV+=LD ="$(LD ) " CPP="$(CPP ) " CXXCPP="$(CPP ) "
253
- EXTRAOBJS+ =$(DLLCB )
262
+ # fixme!!
263
+ EXTRAOBJS+ =$(FAUXCB )
254
264
255
265
else
256
266
# Mingw compiler
@@ -450,9 +460,13 @@ install:
450
460
mkdir $(INSTALLDIR )
451
461
cp $(LIBRARY ) $(INSTALLDIR )
452
462
463
+ # fixme!!
453
464
ifeq ($(ARCH ) , amd64)
454
465
$(DLLCB ) : dll-callback.c
455
466
$(MINGW ) -DDEFINE_CALLBACKS -c $< $(COUT )
467
+ $(FAUXCB ) : callback.c
468
+ # TODO: Fix: Lazily and incorrectly set WINCE flag to avoid dll-callback support
469
+ $(CC) -DDEFINE_CALLBACKS -D_WIN32_WCE $(CINCLUDES) -c $< $(COUT)
456
470
endif
457
471
458
472
$(RSRC ) : $(BUILD ) /jnidispatch.rc $(BUILD ) /$(JNA_JNI_VERSION ) .stamp
0 commit comments