Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* NOT PART OF TBOX BUILDS *

Browse Source 
Fixed build problems on win32


git-svn-id: svn://10.0.0.236/trunk@78862 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
idk%eng.sun.com
2000-09-12 10:10:20 +00:00
parent 4eccb39e1d
commit 4bfbdacbd9
9 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/java/xpcom/java/src/bcJavaGlobal.cpp
View File

@@ -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";

2
mozilla/java/xpcom/java/src/makefile.win
View File

@@ -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>

2
mozilla/java/xpcom/java/src/org_mozilla_xpcom_Utilities.cpp
View File

@@ -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();