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

M mozilla/Makefile.in

Browse Source 
M src/Makefile.in

- Force logging to be enabled, regardless of debugging setting.

M src/PlugletEngine.cpp

- Make sure to disable JVM debugging.


git-svn-id: svn://10.0.0.236/trunk@216477 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2006-12-05 13:02:25 +00:00
parent 43df37f53d
commit dac867a2cc
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/java/plugins/mozilla/Makefile.in
View File

@@ -82,6 +82,8 @@ INCLUDES += \
CXXFLAGS += /Zi /Yd
endif
CXXFLAGS += -DFORCE_PR_LOG
DEFINES += -DMOZILLA_STRICT_API
ifeq ($(OS_ARCH),Linux)

2
mozilla/java/plugins/src/Makefile.in
View File

@@ -85,7 +85,7 @@ XPIDLSRCS = \
iPlugletManager.idl \
$(NULL)
CXXFLAGS := $(MOZ_TOOLKIT_REGISTRY_CFLAGS) -DMOZILLA_INTERNAL_API -D_REENTRANT -DOJI_DISABLE $(CXXFLAGS)
CXXFLAGS := $(MOZ_TOOLKIT_REGISTRY_CFLAGS) -DMOZILLA_INTERNAL_API -D_REENTRANT -DOJI_DISABLE $(CXXFLAGS) -DFORCE_PR_LOG
ifeq ($(OS_ARCH),Darwin)
INCLUDES += -I$(MOZ_JDKHOME)/include -I.

2
mozilla/java/plugins/src/PlugletEngine.cpp
View File

@@ -202,7 +202,7 @@ void PlugletEngine::StartJVM() {
options[3].optionString=""; //-Djava.compiler=NONE";
vm_args.version = JNI_VERSION_1_4;
vm_args.options = options;
vm_args.nOptions = 3; // EDBURNS: Change to 4 for debugging
vm_args.nOptions = 1; // EDBURNS: Change to 3 for debugging
vm_args.ignoreUnrecognized = JNI_FALSE;
/* Create the Java VM */
res = JNI_CreateJavaVM(&jvm, (void**)&env, &vm_args);