зеркало из https://github.com/mozilla/pjs.git
Make plugletjni.lib and .dll build.
M makefiles - remove plugins/Makefile, this'll be replaced by ant - add jni Makefile R plugins/makefile.win R plugins/jni/makefile.win R plugins/src/makefile.win - obsolete. M plugins/jni/Makefile.in - new includes and such M plugins/jni/org_mozilla_pluglet_mozilla_PlugletOutputStream.cpp - cast to const char *.
This commit is contained in:
Родитель
0743107669
Коммит
7c70c0827b
|
@ -4,5 +4,5 @@ java/webclient/src_moz/gtk/Makefile
|
|||
java/webclient/src_moz/Makefile
|
||||
java/webclient/src_ie/Makefile
|
||||
java/webclient/src_share/Makefile
|
||||
java/plugins/Makefile
|
||||
java/plugins/src/Makefile
|
||||
java/plugins/jni/Makefile
|
||||
|
|
|
@ -45,6 +45,16 @@ CPPSRCS = \
|
|||
org_mozilla_util_DebugPluglet.cpp \
|
||||
$(NULL)
|
||||
|
||||
INCLUDES += -I$(MOZILLA_FIVE_HOME)/../include/xpcom \
|
||||
-I$(MOZILLA_FIVE_HOME)/../include/plugin \
|
||||
-I$(MOZILLA_FIVE_HOME)/../include/string \
|
||||
-I$(MOZILLA_FIVE_HOME)/../include/xpcom_obsolete \
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
|
|
|
@ -62,7 +62,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletOutputStream_nati
|
|||
("PlugletOutputStream.nativeWrite: stream = %p, off = %i, len = %i\n", output, off, len));
|
||||
env->GetByteArrayRegion(b,off,len,buf);
|
||||
PRUint32 tmp;
|
||||
output->Write(buf,len,&tmp);
|
||||
output->Write((const char *)buf,len,&tmp);
|
||||
PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
|
||||
("PlugletOutputStream.nativeWrite: %i bytes written\n", tmp));
|
||||
free(buf);
|
||||
|
|
Загрузка…
Ссылка в новой задаче