Browse Source

* syswin32 -> system update finally after one week

peter 25 years ago
parent
commit
015743f9fd
4 changed files with 24 additions and 8 deletions
  1. 3 1
      rtl/win32/Makefile.fpc
  2. 5 5
      rtl/win32/wdllprt0.as
  3. 2 2
      rtl/win32/wprt0.as
  4. 14 0
      rtl/win32/wprt0_10.as

+ 3 - 1
rtl/win32/Makefile.fpc

@@ -3,7 +3,7 @@
 #
 #
 
 
 [targets]
 [targets]
-loaders=wprt0 wdllprt0
+loaders=$(PRT0) wdllprt0
 units=$(SYSTEMUNIT) objpas strings \
 units=$(SYSTEMUNIT) objpas strings \
       windows ole2 opengl32 os_types winsock initc \
       windows ole2 opengl32 os_types winsock initc \
       dos crt objects graph \
       dos crt objects graph \
@@ -38,8 +38,10 @@ UNITPREFIX=rtl
 
 
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
 SYSTEMUNIT=system
+PRT0=wprt0
 else
 else
 SYSTEMUNIT=syswin32
 SYSTEMUNIT=syswin32
+PRT0=wprt0_10
 endif
 endif
 
 
 # Paths
 # Paths

+ 5 - 5
rtl/win32/wdllprt0.as

@@ -4,11 +4,11 @@
      .text
      .text
      .globl _mainCRTStartup
      .globl _mainCRTStartup
 _mainCRTStartup:
 _mainCRTStartup:
-     movb $1,U_SYSWIN32_ISCONSOLE
+     movb $1,U_SYSTEM_ISCONSOLE
      jmp .LDLL_Entry
      jmp .LDLL_Entry
      .globl _WinMainCRTStartup
      .globl _WinMainCRTStartup
 _WinMainCRTStartup:
 _WinMainCRTStartup:
-     movb $0,U_SYSWIN32_ISCONSOLE
+     movb $0,U_SYSTEM_ISCONSOLE
 .LDLL_Entry:
 .LDLL_Entry:
      pushl    %ebp
      pushl    %ebp
      movl     %esp,%ebp
      movl     %esp,%ebp
@@ -16,11 +16,11 @@ _WinMainCRTStartup:
      pushl    %esi
      pushl    %esi
      pushl    %edi
      pushl    %edi
      movl     8(%ebp),%edi
      movl     8(%ebp),%edi
-     movl     %edi,U_SYSWIN32_HINSTANCE
+     movl     %edi,U_SYSTEM_HINSTANCE
      movl     12(%ebp),%edi
      movl     12(%ebp),%edi
-     movl     %edi,U_SYSWIN32_DLLREASON
+     movl     %edi,U_SYSTEM_DLLREASON
      movl     16(%ebp),%edi
      movl     16(%ebp),%edi
-     movl     %edi,U_SYSWIN32_DLLPARAM
+     movl     %edi,U_SYSTEM_DLLPARAM
      call     _FPC_DLL_Entry
      call     _FPC_DLL_Entry
      popl     %edi
      popl     %edi
      popl     %esi
      popl     %esi

+ 2 - 2
rtl/win32/wprt0.as

@@ -5,10 +5,10 @@
      .text
      .text
      .globl _mainCRTStartup
      .globl _mainCRTStartup
 _mainCRTStartup:
 _mainCRTStartup:
-     movb   $1,U_SYSWIN32_ISCONSOLE
+     movb   $1,U_SYSTEM_ISCONSOLE
      call   _FPC_EXE_Entry
      call   _FPC_EXE_Entry
      .globl _WinMainCRTStartup
      .globl _WinMainCRTStartup
 _WinMainCRTStartup:
 _WinMainCRTStartup:
-     movb   $0,U_SYSWIN32_ISCONSOLE
+     movb   $0,U_SYSTEM_ISCONSOLE
      call   _FPC_EXE_Entry
      call   _FPC_EXE_Entry
  
  

+ 14 - 0
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
+