* NOT PART OF TBOX BUILDS *

Fixed build problems on win32
This commit is contained in:
idk%eng.sun.com 2000-09-12 10:10:20 +00:00
parent e275549edd
commit 2fd76f7971
9 changed files with 14 additions and 7 deletions

@ -38,6 +38,8 @@ OBJS= \
LLIBS=$(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib
LINCS=-I$(JDKHOME)\include -I$(JDKHOME)\include\win32
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)

@ -60,7 +60,7 @@ void bcJavaGlobal::StartJVM() {
if (jvmCount) {
return;
}
#if 0
#if 0
JDK1_1InitArgs vm_args;
char classpath[1024];
JNI_GetDefaultJavaVMInitArgs(&vm_args);
@ -77,12 +77,11 @@ void bcJavaGlobal::StartJVM() {
vm_args.classpath = classpath;
/* Create the Java VM */
res = JNI_CreateJavaVM(&jvm, JNIENV &env, &vm_args);
#endif
#if 1
#else
char classpath[1024];
JavaVMInitArgs vm_args;
JavaVMOption options[2];
sprintf(classpath, "-Djava.class.path=%s:/ws/mozilla/dist/classes",PR_GetEnv("CLASSPATH"));
sprintf(classpath, "-Djava.class.path=%s",PR_GetEnv("CLASSPATH"));
printf("--[c++] classpath %s\n",classpath);
options[0].optionString = classpath;
options[1].optionString=""; //-Djava.compiler=NONE";

@ -42,6 +42,8 @@ OBJS= \
.\$(OBJDIR)\org_mozilla_xpcom_Utilities.obj \
$(NULL)
LINCS=-I$(JDKHOME)\include -I$(JDKHOME)\include\win32
LLIBS=$(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib $(JDKHOME)\lib\jvm.lib
include <$(DEPTH)\config\rules.mak>

@ -60,7 +60,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_xpcom_Utilities_callMethodByIndex
}
/*****/
bcIMarshaler * m = call->GetMarshaler();
bcJavaMarshalToolkit * mt = new bcJavaMarshalToolkit(mid, interfaceInfo, args, env, 0, orb);
bcJavaMarshalToolkit * mt = new bcJavaMarshalToolkit((unsigned)mid, interfaceInfo, args, env, 0, orb);
mt->Marshal(m);
orb->SendReceive(call);
bcIUnMarshaler * um = call->GetUnMarshaler();

@ -23,6 +23,7 @@
#include "nsIGenericFactory.h"
#include "nsIModule.h"
#include "stdlib.h"
#define BC_JAVA_SAMPLE_CID \
{0x072fa586, 0x1dd2, 0x11b2, \

@ -14,7 +14,7 @@
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All
# Copyright (C) 1999 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
@ -37,7 +37,7 @@ XPIDLSRCS = \
.\bcIJavaSample.idl \
$(NULL)
OBJS = bcJavaSample.obj
OBJS = .\$(OBJDIR)\bcJavaSample.obj
LLIBS=$(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib
include <$(DEPTH)\config\rules.mak>

@ -20,6 +20,7 @@
* Igor Kushnirskiy <idk@eng.sun.com>
*/
#include "pratom.h"
#include "nsIInterfaceInfoManager.h"
#include "bcXPCOMProxy.h"

@ -20,6 +20,7 @@
* Igor Kushnirskiy <idk@eng.sun.com>
*/
#include "prmem.h"
#include "nsIInterfaceInfo.h"
#include "nsIInterfaceInfoManager.h"
#include "xptcall.h"

@ -42,6 +42,7 @@ EXPORTS = \
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR) \
$(NULL)
include <$(DEPTH)\config\rules.mak>