Commit 1e534705 authored by Kevin Bracey's avatar Kevin Bracey
Browse files

Ursula branch merged (Makefile changes). Made 32-bit compatible.

No functional changes.
parent 0aab2177
......@@ -12,6 +12,6 @@
| See the License for the specific language governing permissions and
| limitations under the License.
|
Prefix <Obey$Dir>
Echo Cleaning <Prefix$Dir> ...
Dir <Obey$Dir>
Echo Cleaning <Obey$Dir> ...
AMU_machine INSTDIR=!Draw clean_all
......@@ -13,6 +13,6 @@
| limitations under the License.
|
WIMPSlot -min 2048K -max 2048K
Prefix <Obey$Dir>
Dir <Obey$Dir>
Echo Compiling <Obey$Dir> ...
amu_machine THROWBACK=-throwback asms
......@@ -13,6 +13,6 @@
| limitations under the License.
|
WIMPSlot -min 2048K -max 2048K
Prefix <Obey$Dir>
Dir <Obey$Dir>
Echo Making <Obey$Dir> ...
amu_machine THROWBACK=-throwback INSTDIR=Debug.!Draw installd
......@@ -13,6 +13,6 @@
| limitations under the License.
|
WIMPSlot -min 2048K -max 2048K
Prefix <Obey$Dir>
Dir <Obey$Dir>
Echo Making <Obey$Dir> ...
amu_machine THROWBACK=-throwback INSTDIR=!Draw install
......@@ -12,7 +12,7 @@
| See the License for the specific language governing permissions and
| limitations under the License.
|
Prefix <Obey$Dir>.^
Dir <Obey$Dir>.^
Echo To do <Obey$Dir> ...
WIMPSlot -min 640K
AMU -n INSTDIR=Boot:Medusa.Draw.Source THROWBACK=-throwback app appd
......@@ -12,6 +12,6 @@
| See the License for the specific language governing permissions and
| limitations under the License.
|
Prefix <Obey$Dir>.^
Echo Cleaning <Prefix$Dir> ...
Dir <Obey$Dir>.^
Echo Cleaning <Obey$Dir> ...
AMU INSTDIR=Boot:Medusa.Draw.Source very_clean
......@@ -12,7 +12,7 @@
| See the License for the specific language governing permissions and
| limitations under the License.
|
Prefix <Obey$Dir>.^
Dir <Obey$Dir>.^
Echo Making <Obey$Dir> ...
WIMPSlot -min 640K -max 640K
AMU INSTDIR=Boot:Medusa.Draw.Source THROWBACK=-throwback asms
......@@ -12,7 +12,7 @@
| See the License for the specific language governing permissions and
| limitations under the License.
|
Prefix <Obey$Dir>.^
Dir <Obey$Dir>.^
Echo Making <Obey$Dir> ...
WIMPSlot -min 2048K -max 2048K
AMU INSTDIR=Boot:Medusa.Draw.Source THROWBACK=-throwback app appd
......@@ -12,7 +12,7 @@
| See the License for the specific language governing permissions and
| limitations under the License.
|
Prefix <Obey$Dir>.^
Dir <Obey$Dir>.^
Echo Making <Obey$Dir> ...
WIMPSlot -min 640K -max 640K
AMU INSTDIR=Boot:Medusa.Draw.Source THROWBACK=-throwback linkmap
......@@ -275,7 +275,7 @@ rom_link:
${CP} linked.${COMPONENT} ${LINKDIR}.${COMPONENT} ${CPFLAGS}
@echo ${COMPONENT}: rom_link complete
oz.ModuleWrap: s.ModuleWrap s.AppName ${RESFILES}
oz.ModuleWrap: s.ModuleWrap s.AppName ${RESFILES} s.resfiles
${AS} ${AFLAGS} s.ModuleWrap $@
s.ModuleWrap: ${WRAPPER}
......
......@@ -31,6 +31,9 @@ SP RN 13
LR RN 14
PC RN 15
GET Hdr:ListOpts
GET Hdr:APCS.<APCS>
EXPORT xjpeginfo_dimensions
EXPORT xjpeg_plot_scaled
EXPORT xjpeg_plot_transformed
......@@ -63,7 +66,7 @@ xjpeginfo_dimensions ROUT
MOV R, #0
99 ADD SP, SP, #8
LDMFD SP!, {V1, V2, V3}
MOVS PC, IP
Return ,LinkNotStacked,,IP
xjpeg_plot_scaled ROUT
MOV IP, SP
......@@ -71,20 +74,12 @@ xjpeg_plot_scaled ROUT
LDMFD IP, {R4, R5}
SWI &69982
MOVVC R, #0
LDMFD SP!, {V1, V2, PC}^
xjpeg_plot_file_scaled ROUT
MOV IP, SP
STMFD SP!, {V1, LR}
LDMFD IP, {R4}
SWI &69983
MOVVC R, #0
LDMFD SP!, {V1, PC}^
Return "V1, V2"
xjpeg_plot_transformed ROUT
MOV IP, LR
SWI &69984
MOVVC R, #0
MOVS PC, IP
Return ,LinkNotStacked,,IP
END
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