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

No functional changes.

!Clean,fd7

@@ -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=!Paint clean_all

!Compile,fd7

@@ -13,6 +13,6 @@
 | limitations under the License.
 |
 WIMPSlot -min 1996K -max 1996K
-Prefix <Obey$Dir>
-Echo Making <Prefix$Dir> ...
+Dir <Obey$Dir>
+Echo Making <Obey$Dir> ...
 AMU_machine THROWBACK=-throwback INSTDIR=!Paint asms

!Debug,fd7

@@ -13,6 +13,6 @@
 | limitations under the License.
 |
 WIMPSlot -min 1996K -max 1996K
-Prefix <Obey$Dir>
-Echo Making <Prefix$Dir> ...
+Dir <Obey$Dir>
+Echo Making <Obey$Dir> ...
 AMU_machine THROWBACK=-throwback INSTDIR=debug.!Paint installd

!Make,fd7

@@ -13,6 +13,6 @@
 | limitations under the License.
 |
 WIMPSlot -min 1996K -max 1996K
-Prefix <Obey$Dir>
-Echo Making <Prefix$Dir> ...
+Dir <Obey$Dir>
+Echo Making <Obey$Dir> ...
 AMU_machine THROWBACK=-throwback INSTDIR=!Paint install

Makefile

@@ -245,13 +245,12 @@ ${ROM_MODULE}: oz.ModuleWrap ${OBJSZ} ${ROMSTUBS}
 
 # final link for ROM Image (using given base address)
 rom_link:
-	${LD} -o linked.${COMPONENT} -bin -base ${ADDRESS} ${ROM_MODULE} ${ABSSYM} \
+	${LD} -o linked.${COMPONENT} -rmf -base ${ADDRESS} ${ROM_MODULE} ${ABSSYM} \
               -map > map.${COMPONENT}
-	truncate map.${COMPONENT} linked.${COMPONENT}
 	${CP} linked.${COMPONENT} ${LINKDIR}.${COMPONENT} ${CPFLAGS}
 	@echo ${COMPONENT}: rom_link complete
 
-oz.ModuleWrap: s.ModuleWrap ${RESFILES}
+oz.ModuleWrap: s.ModuleWrap ${RESFILES} s.AppName s.Resfiles
 	${AS} ${AFLAGS} s.ModuleWrap $@
 
 s.ModuleWrap: ${WRAPPER}

asm/jpeg

 ;ObjAsm file for JPEG
 ;written by DefMod (Aug 16 1994) on Tue Sep 20 15:06:43 1994
 
+;Tweaked for 32-bit by KBracey on Sat Nov 27 1999
+
 R0      RN      0
 R1      RN      1
 R2      RN      2
@@ -32,6 +34,9 @@ SP      RN      13
 LR      RN      14
 PC      RN      15
 
+        GET     Hdr:ListOpts
+        GET     Hdr:APCS.<APCS>
+
         EXPORT  xjpeginfo_dimensions
         EXPORT  jpeginfo_dimensions
         EXPORT  xjpegfileinfo_dimensions
@@ -73,7 +78,8 @@ xjpeginfo_dimensions ROUT
         MOV     R, #0
 99      ADD     SP, SP, #8
         LDMFD   SP!, {V1, V2, V3}
-        MOVS    PC, IP
+
+        Return  ,LinkNotStacked,,IP
 
 jpeginfo_dimensions ROUT
         STMFD   SP!, {A3, A4, V1, V2, V3}
@@ -95,7 +101,7 @@ jpeginfo_dimensions ROUT
         STRNE   R5, [IP]
         ADD     SP, SP, #8
         LDMFD   SP!, {V1, V2, V3}
-        MOVS    PC, LR
+        Return  ,LinkNotStacked
 
 xjpegfileinfo_dimensions ROUT
         MOV     IP, LR
@@ -122,7 +128,7 @@ xjpegfileinfo_dimensions ROUT
         MOV     R, #0
 99      ADD     SP, SP, #12
         LDMFD   SP!, {V1, V2, V3}
-        MOVS    PC, IP
+        Return  ,LinkNotStacked,,IP
 
 jpegfileinfo_dimensions ROUT
         STMFD   SP!, {A2, A3, A4, V1, V2, V3}
@@ -143,7 +149,7 @@ jpegfileinfo_dimensions ROUT
         STRNE   R5, [IP]
         ADD     SP, SP, #12
         LDMFD   SP!, {V1, V2, V3}
-        MOVS    PC, LR
+        Return  ,LinkNotStacked
 
 xjpeg_plot_scaled ROUT
         MOV     IP, SP
@@ -151,14 +157,14 @@ xjpeg_plot_scaled ROUT
         LDMFD   IP, {R4, R5}
         SWI     &69982
         MOVVC   R, #0
-        LDMFD   SP!, {V1, V2, PC}^
+        Return  "V1, V2"
 
 jpeg_plot_scaled ROUT
         MOV     IP, SP
         STMFD   SP!, {V1, V2, LR}
         LDMFD   IP, {R4, R5}
         SWI     &49982
-        LDMFD   SP!, {V1, V2, PC}^
+        Return  "V1, V2"
 
 xjpeg_plot_file_scaled ROUT
         MOV     IP, SP
@@ -166,33 +172,33 @@ xjpeg_plot_file_scaled ROUT
         LDMFD   IP, {R4}
         SWI     &69983
         MOVVC   R, #0
-        LDMFD   SP!, {V1, PC}^
+        Return  "V1"
 
 jpeg_plot_file_scaled ROUT
         MOV     IP, SP
         STMFD   SP!, {V1, LR}
         LDMFD   IP, {R4}
         SWI     &49983
-        LDMFD   SP!, {V1, PC}^
+        Return  "V1"
 
 xjpeg_plot_transformed ROUT
         MOV     IP, LR
         SWI     &69984
         MOVVC   R, #0
-        MOVS    PC, IP
+        Return  ,LinkNotStacked,,IP
 
 jpeg_plot_transformed ROUT
         SWI     &49984
-        MOVS    PC, LR
+        Return  ,LinkNotStacked
 
 xjpeg_plot_file_transformed ROUT
         MOV     IP, LR
         SWI     &69985
         MOVVC   R, #0
-        MOVS    PC, IP
+        Return  ,LinkNotStacked,,IP
 
 jpeg_plot_file_transformed ROUT
         SWI     &49985
-        MOVS    PC, LR
+        Return  ,LinkNotStacked
 
         END

asm/writepixel

@@ -2,6 +2,8 @@
 ;written by DefMod (Oct 24 1994) on Wed Oct 26 11:31:56 1994
 ;Copyright  Acorn Computers Ltd, 1994
 
+;Tweaked for 32-bit by KBracey on Sat Nov 27 1999
+
 R0      RN      0
 R1      RN      1
 R2      RN      2
@@ -33,6 +35,9 @@ SP      RN      13
 LR      RN      14
 PC      RN      15
 
+	GET     Hdr:ListOpts
+        GET     Hdr:APCS.<APCS>
+
         EXPORT  xosspriteop_write_pixel_colour
         EXPORT  xosspriteop_write_pixel_mask
 
@@ -45,7 +50,7 @@ xosspriteop_write_pixel_colour ROUT
         ORR     R0, R0, #&2A
         SWI     &2002E
         MOVVC   R, #0
-        LDMFD   SP!, {V1, V2, V3, PC}^
+	Return	"V1, V2, V3"
 
 xosspriteop_write_pixel_mask ROUT
         MOV     IP, SP
@@ -54,6 +59,6 @@ xosspriteop_write_pixel_mask ROUT
         ORR     R0, R0, #&2C
         SWI     &2002E
         MOVVC   R, #0
-        LDMFD   SP!, {V1, V2, PC}^
+	Return	"V1, V2"
 
         END