Commit 52c03f75 authored by Claes Sjofors's avatar Claes Sjofors

Merge branch 'master' of pwrcvs:/data1/git/pwr

parents c84b3cc8 5ea0f459
...@@ -347,7 +347,7 @@ public class JopLang { ...@@ -347,7 +347,7 @@ public class JopLang {
if ( i == 0 && btree_en_us != null) if ( i == 0 && btree_en_us != null)
continue; continue;
if ( root != null && root instanceof JopApplet) { if ( root != null && root instanceof JApplet) {
try { try {
URL current = ((JApplet) root).getCodeBase(); URL current = ((JApplet) root).getCodeBase();
String current_str = current.toString(); String current_str = current.toString();
......
...@@ -15,9 +15,9 @@ local_java_sources := \ ...@@ -15,9 +15,9 @@ local_java_sources := \
JopUtilityIfc.java \ JopUtilityIfc.java \
JopUtility.java \ JopUtility.java \
JopSession.java \ JopSession.java \
JopLang.java \
JopMethods.java \ JopMethods.java \
JopMethodsMenu.java \ JopMethodsMenu.java \
JopLang.java \
JopConfirm.java \ JopConfirm.java \
JopConfirmDialog.java \ JopConfirmDialog.java \
JopFrame.java \ JopFrame.java \
......
...@@ -220,6 +220,7 @@ sub build_kernel # args: flavour ...@@ -220,6 +220,7 @@ sub build_kernel # args: flavour
_module("otherio"); _module("otherio");
_build("exp","rt","src","copy"); _build("exp","rt","src","copy");
_build("lib","usbio_dummy","src","init lib"); _build("lib","usbio_dummy","src","init lib");
_build("lib","usb_dummy","src","init lib");
merge(); merge();
_module("xtt"); _module("xtt");
build_all("exe", $flavour); build_all("exe", $flavour);
...@@ -325,6 +326,7 @@ sub ebuild # args: pass flavour ...@@ -325,6 +326,7 @@ sub ebuild # args: pass flavour
_module("otherio"); _module("otherio");
_build("exp","rt","src","copy"); _build("exp","rt","src","copy");
_build("lib","usbio_dummy","src","init lib"); _build("lib","usbio_dummy","src","init lib");
_build("lib","usb_dummy","src","init lib");
merge(); merge();
_module("rt"); _module("rt");
_build("exe", "rt*", "src", "all"); _build("exe", "rt*", "src", "all");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment