From 015743f9fdb719ba81f56313dd9c02ad10067aff Mon Sep 17 00:00:00 2001 From: peter Date: Sat, 21 Oct 2000 14:36:46 +0000 Subject: [PATCH] * syswin32 -> system update finally after one week --- rtl/win32/Makefile.fpc | 4 +++- rtl/win32/wdllprt0.as | 10 +++++----- rtl/win32/wprt0.as | 4 ++-- rtl/win32/wprt0_10.as | 14 ++++++++++++++ 4 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 rtl/win32/wprt0_10.as diff --git a/rtl/win32/Makefile.fpc b/rtl/win32/Makefile.fpc index ec61af685f..37f6eeaedc 100644 --- a/rtl/win32/Makefile.fpc +++ b/rtl/win32/Makefile.fpc @@ -3,7 +3,7 @@ # [targets] -loaders=wprt0 wdllprt0 +loaders=$(PRT0) wdllprt0 units=$(SYSTEMUNIT) objpas strings \ windows ole2 opengl32 os_types winsock initc \ dos crt objects graph \ @@ -38,8 +38,10 @@ UNITPREFIX=rtl ifeq ($(findstring 1.0.,$(FPC_VERSION)),) SYSTEMUNIT=system +PRT0=wprt0 else SYSTEMUNIT=syswin32 +PRT0=wprt0_10 endif # Paths diff --git a/rtl/win32/wdllprt0.as b/rtl/win32/wdllprt0.as index 24395b40cf..6c81900d35 100644 --- a/rtl/win32/wdllprt0.as +++ b/rtl/win32/wdllprt0.as @@ -4,11 +4,11 @@ .text .globl _mainCRTStartup _mainCRTStartup: - movb $1,U_SYSWIN32_ISCONSOLE + movb $1,U_SYSTEM_ISCONSOLE jmp .LDLL_Entry .globl _WinMainCRTStartup _WinMainCRTStartup: - movb $0,U_SYSWIN32_ISCONSOLE + movb $0,U_SYSTEM_ISCONSOLE .LDLL_Entry: pushl %ebp movl %esp,%ebp @@ -16,11 +16,11 @@ _WinMainCRTStartup: pushl %esi pushl %edi movl 8(%ebp),%edi - movl %edi,U_SYSWIN32_HINSTANCE + movl %edi,U_SYSTEM_HINSTANCE movl 12(%ebp),%edi - movl %edi,U_SYSWIN32_DLLREASON + movl %edi,U_SYSTEM_DLLREASON movl 16(%ebp),%edi - movl %edi,U_SYSWIN32_DLLPARAM + movl %edi,U_SYSTEM_DLLPARAM call _FPC_DLL_Entry popl %edi popl %esi diff --git a/rtl/win32/wprt0.as b/rtl/win32/wprt0.as index 5ab5b00661..add50cf8ca 100644 --- a/rtl/win32/wprt0.as +++ b/rtl/win32/wprt0.as @@ -5,10 +5,10 @@ .text .globl _mainCRTStartup _mainCRTStartup: - movb $1,U_SYSWIN32_ISCONSOLE + movb $1,U_SYSTEM_ISCONSOLE call _FPC_EXE_Entry .globl _WinMainCRTStartup _WinMainCRTStartup: - movb $0,U_SYSWIN32_ISCONSOLE + movb $0,U_SYSTEM_ISCONSOLE call _FPC_EXE_Entry diff --git a/rtl/win32/wprt0_10.as b/rtl/win32/wprt0_10.as new file mode 100644 index 0000000000..5ab5b00661 --- /dev/null +++ b/rtl/win32/wprt0_10.as @@ -0,0 +1,14 @@ +//Startup code for WIN32 port of FPK-Pascal 0.9.98 +//Written by P.Ozerski +//1998 +// modified by Pierre Muller + .text + .globl _mainCRTStartup +_mainCRTStartup: + movb $1,U_SYSWIN32_ISCONSOLE + call _FPC_EXE_Entry + .globl _WinMainCRTStartup +_WinMainCRTStartup: + movb $0,U_SYSWIN32_ISCONSOLE + call _FPC_EXE_Entry +