diff --git a/reactos/drivers/dd/vga/display/makefile b/reactos/drivers/dd/vga/display/makefile index b0bbcd2d080..0de7848ea18 100644 --- a/reactos/drivers/dd/vga/display/makefile +++ b/reactos/drivers/dd/vga/display/makefile @@ -1,24 +1,13 @@ -# $Id: makefile,v 1.16 2001/07/15 21:18:59 rex Exp $ +# $Id: makefile,v 1.17 2001/07/26 16:52:07 ekohl Exp $ # # Makefile for ReactOS vgaddi.dll # PATH_TO_TOP = ../../../.. -TARGET=vgaddi + +TARGET = vgaddi CFLAGS = -D__NTDRIVER__ -I. -ifneq ($(HOST),mingw32-windows) - ifneq ($(HOST),mingw32-linux) - DLLTARGET=$(TARGET).a - else - DLLTARGET=$(TARGET).dll - endif -else - DLLTARGET=$(TARGET).dll -endif - -all: $(DLLTARGET) - MAIN_OBJECTS = main/enable.o OTHER_OBJECTS = objects/screen.o objects/pointer.o objects/lineto.o objects/paint.o objects/bitblt.o \ vgavideo/vgavideo.o objects/transblt.o @@ -26,12 +15,18 @@ RESOURCE_OBJECTS = $(TARGET).coff OBJECTS = $(MAIN_OBJECTS) $(OTHER_OBJECTS) $(RESOURCE_OBJECTS) +LIBS = $(PATH_TO_TOP)/ntoskrnl/ntoskrnl.a \ + $(PATH_TO_TOP)/subsys/win32k/win32k.a + + +all: $(TARGET).dll $(TARGET).a + $(TARGET).a: $(OBJECTS) $(AR) csr $(TARGET).a $(OBJECTS) -$(TARGET).coff: $(TARGET).rc ../../../../include/reactos/resource.h +$(TARGET).coff: $(TARGET).rc $(PATH_TO_TOP)/include/reactos/resource.h -$(TARGET).dll: $(DLLMAIN) $(OBJECTS) $(TARGET).def +$(TARGET).dll: $(OBJECTS) $(LIBS) $(TARGET).def $(LD) -r $(OBJECTS) -o $(TARGET).o $(DLLTOOL) \ --dllname $(TARGET).dll \ @@ -39,12 +34,15 @@ $(TARGET).dll: $(DLLMAIN) $(OBJECTS) $(TARGET).def --kill-at \ --output-lib $(TARGET).a $(CC) $(TARGET).o \ - ../../../../subsys/win32k/win32k.a \ - ../../../../ntoskrnl/ntoskrnl.a \ - -specs=$(TARGET)_specs \ + $(LIBS) \ + -nostartfiles \ + -nostdlib \ -mdll \ -o junk.tmp \ -Wl,--entry,_DrvEnableDriver \ + -Wl,--defsym,_end=end \ + -Wl,--defsym,_edata=__data_end__ \ + -Wl,--defsym,_etext=etext \ -Wl,--base-file,base.tmp - $(RM) junk.tmp $(DLLTOOL) \ @@ -54,11 +52,12 @@ $(TARGET).dll: $(DLLMAIN) $(OBJECTS) $(TARGET).def --def $(TARGET).edf - $(RM) base.tmp $(CC) $(TARGET).o \ - ../../../../subsys/win32k/win32k.a \ - ../../../../ntoskrnl/ntoskrnl.a \ - -specs=$(TARGET)_specs \ + $(LIBS) \ + -nostartfiles \ + -nostdlib \ -mdll \ -o $(TARGET).dll \ + -Wl,--subsystem,native \ -Wl,--entry,_DrvEnableDriver \ -Wl,--image-base,0x70000000 \ -Wl,--file-alignment,0x1000 \ @@ -82,8 +81,8 @@ $(FLOPPY_DIR)/dlls/$(TARGET).dll: $(TARGET).dll dist: $(DIST_DIR)/dlls/$(TARGET).dll $(DIST_DIR)/dlls/$(TARGET).dll: $(TARGET).dll - $(CP) $(TARGET).dll ../../../../$(DIST_DIR)/dlls/$(TARGET).dll + $(CP) $(TARGET).dll $(PATH_TO_TOP)/$(DIST_DIR)/dlls/$(TARGET).dll -include ../../../../rules.mak +include $(PATH_TO_TOP)/rules.mak # EOF diff --git a/reactos/drivers/dd/vga/display/vgaddi_specs b/reactos/drivers/dd/vga/display/vgaddi_specs deleted file mode 100644 index 096efd6c4c1..00000000000 --- a/reactos/drivers/dd/vga/display/vgaddi_specs +++ /dev/null @@ -1,78 +0,0 @@ -*asm: - - -*asm_final: - - -*cpp: --remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE} - -*cc1: -%(cc1_spec) - -*cc1plus: - - -*endfile: - - -*link: -%{mwindows:--subsystem windows} %{mdll:--dll -e _DllMainCRTStartup@12} - -*lib: - - -*libgcc: --lgcc - -*startfile: - - -*switches_need_spaces: - - -*signed_char: -%{funsigned-char:-D__CHAR_UNSIGNED__} - -*predefines: --Di386 -D_WIN32 -DWIN32 -D__WIN32__ -D__MINGW32__ -DWINNT -D_X86_=1 -D__STDC__=1 -D__stdcall=__attribute__((__stdcall__)) _D_stdcall=__attribute__((__stdcall__)) -D__cdecl=__attribute__((__cdecl__)) -D__declspec(x)=__attribute__((x)) -Asystem(winnt) -Acpu(i386) -Amachine(i386) - -*cross_compile: -1 - -*version: -egcs-2.91.57 - -*multilib: -. ; - -*multilib_defaults: - - -*multilib_extra: - - -*multilib_matches: - - -*linker: -collect2 - -*cpp_486: -%{!ansi:-Di486} -D__i486 -D__i486__ - -*cpp_586: -%{!ansi:-Di586 -Dpentium} -D__i586 -D__i586__ -D__pentium -D__pentium__ - -*cpp_686: -%{!ansi:-Di686 -Dpentiumpro} -D__i686 -D__i686__ -D__pentiumpro -D__pentiumpro__ - -*cpp_cpu_default: -%(cpp_586) - -*cpp_cpu: --Acpu(i386) -Amachine(i386) %{!ansi:-Di386} -D__i386 -D__i386__ %{mcpu=i486:%(cpp_486)} %{m486:%(cpp_486)} %{mpentium:%(cpp_586)} %{mcpu=pentium:%(cpp_586)} %{mpentiumpro:%(cpp_686)} %{mcpu=pentiumpro:%(cpp_686)} %{!mcpu*:%{!m486:%{!mpentium*:%(cpp_cpu_default)}}} - -*cc1_cpu: -%{!mcpu*: %{m386:-mcpu=i386 -march=i386} %{mno-486:-mcpu=i386 -march=i386} %{m486:-mcpu=i486 -march=i486} %{mno-386:-mcpu=i486 -march=i486} %{mno-pentium:-mcpu=i486 -march=i486} %{mpentium:-mcpu=pentium} %{mno-pentiumpro:-mcpu=pentium} %{mpentiumpro:-mcpu=pentiumpro}} - diff --git a/reactos/drivers/svc_specs b/reactos/drivers/svc_specs deleted file mode 100644 index 16083697063..00000000000 --- a/reactos/drivers/svc_specs +++ /dev/null @@ -1,78 +0,0 @@ -*asm: - - -*asm_final: - - -*cpp: --remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE} - -*cc1: -%(cc1_spec) - -*cc1plus: - - -*endfile: - - -*link: -%{mwindows:--subsystem windows} %{mdll:--dll -e _DriverEntry@8} - -*lib: - - -*libgcc: - - -*startfile: - - -*switches_need_spaces: - - -*signed_char: -%{funsigned-char:-D__CHAR_UNSIGNED__} - -*predefines: --Di386 -D_WIN32 -DWIN32 -D__WIN32__ -D__MINGW32__ -DWINNT -D_X86_=1 -D__STDC__=1 -D__stdcall=__attribute__((__stdcall__)) -D_stdcall=__attribute__((__stdcall__)) -D__cdecl=__attribute__((__cdecl__)) -D__declspec(x)=__attribute__((x)) -Asystem(winnt) -Acpu(i386) -Amachine(i386) - -*cross_compile: -1 - -*version: -egcs-2.91.57 - -*multilib: -. ; - -*multilib_defaults: - - -*multilib_extra: - - -*multilib_matches: - - -*linker: -collect2 - -*cpp_486: -%{!ansi:-Di486} -D__i486 -D__i486__ - -*cpp_586: -%{!ansi:-Di586 -Dpentium} -D__i586 -D__i586__ -D__pentium -D__pentium__ - -*cpp_686: -%{!ansi:-Di686 -Dpentiumpro} -D__i686 -D__i686__ -D__pentiumpro -D__pentiumpro__ - -*cpp_cpu_default: -%(cpp_586) - -*cpp_cpu: --Acpu(i386) -Amachine(i386) %{!ansi:-Di386} -D__i386 -D__i386__ %{mcpu=i486:%(cpp_486)} %{m486:%(cpp_486)} %{mpentium:%(cpp_586)} %{mcpu=pentium:%(cpp_586)} %{mpentiumpro:%(cpp_686)} %{mcpu=pentiumpro:%(cpp_686)} %{!mcpu*:%{!m486:%{!mpentium*:%(cpp_cpu_default)}}} - -*cc1_cpu: -%{!mcpu*: %{m386:-mcpu=i386 -march=i386} %{mno-486:-mcpu=i386 -march=i386} %{m486:-mcpu=i486 -march=i486} %{mno-386:-mcpu=i486 -march=i486} %{mno-pentium:-mcpu=i486 -march=i486} %{mpentium:-mcpu=pentium} %{mno-pentiumpro:-mcpu=pentium} %{mpentiumpro:-mcpu=pentiumpro}} - diff --git a/reactos/rules.mak b/reactos/rules.mak index 48826bc0aa9..b9a23b81511 100644 --- a/reactos/rules.mak +++ b/reactos/rules.mak @@ -26,7 +26,6 @@ EXE_PREFIX := ./ CP = $(PATH_TO_TOP)/rcopy DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as NASM_CMD = nasm -#KM_SPECS = $(TOPDIR)/specs FLOPPY_DIR = /a # DIST_DIR should be relative from the top of the tree DIST_DIR = dist @@ -46,7 +45,6 @@ DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as NASM_CMD = nasmw RM = $(PATH_TO_TOP)/rdel RMDIR = rmdir -#KM_SPECS = specs DOSCLI = yes FLOPPY_DIR = A: # DIST_DIR should be relative from the top of the tree