From 345cc077d0a384969148cf8b2b9236347c71f649 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Tue, 22 Jan 2002 01:46:50 +0000 Subject: [PATCH] * Makefile.PC: Remove OS/2-specific parts. Substitute TARGET_OS - it is always NT now. --- pc/ChangeLog | 3 +++ pc/Makefile.PC | 27 +++++---------------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/pc/ChangeLog b/pc/ChangeLog index db26cbd01..9b08879ae 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,5 +1,8 @@ 2002-01-21 Pavel Roskin + * Makefile.PC: Remove OS/2-specific parts. Substitute + TARGET_OS - it is always NT now. + * config.h: Remove definitions for UNIX-specific permission bits - they are now in fs.h. * dirent_nt.c: Trim includes, disable code under MSVC. diff --git a/pc/Makefile.PC b/pc/Makefile.PC index f92d9e24b..bea042bf3 100644 --- a/pc/Makefile.PC +++ b/pc/Makefile.PC @@ -11,16 +11,10 @@ # # Supported Compilers: # -# For Windows NT: # Makefile.VC4: Microsoft Visual C++ 4.0 and above # Makefile.BC5: Borland C++ 5.x # Makefile.MIN: MinGW # Makefile.RSX: RSX -# For OS/2: -# Makefile.EMX: EMX/GCC -# Makefile.BC2: Borland C++ 2.x -# Makefile.IBM: IBM CSet or Visual Age C++ -# ... # ---- Directories MC_PC_DIR=. @@ -34,7 +28,7 @@ SLANG_OBJS_DIR=$(OBJS_DIR)/slang MC_EXE=$(OBJS_DIR)/mc.exe # --- Midnight Defines -COMMON_DEFINES=-DMC_$(TARGET_OS) $(SPECIFIC_DEFINES) +COMMON_DEFINES=-DMC_NT $(SPECIFIC_DEFINES) MC_DEFINES=$(COMMON_DEFINES) -DHAVE_CONFIG_H MC_INCLUDES=-I$(MC_PC_DIR) -I$(SLANG_SRC_DIR) SLANG_DEFINES=$(COMMON_DEFINES) @@ -122,33 +116,22 @@ MC_SRCS= \ screen.c PC_SRCS= \ - slint_pc.c \ chmod.c \ - drive.c - -NT_SRCS= \ cons_nt.c \ + drive.c \ dirent_nt.c \ key_nt.c \ + slint_pc.c \ util_win32.c \ util_winnt.c \ util_nt.c -OS2_SRCS= \ - cons_os2.c \ - dirent_os2.c \ - key_os2.c \ - util_os2.c - -SLANG_NT=slw32tty.c -SLANG_OS2=slos2tty.c - SLANG_SRCS= \ slerr.c \ slgetkey.c \ slsmg.c \ slvideo.c \ - $(SLANG_$(TARGET_OS)) + slw32tty.c MCEDIT_SRCS= \ edit.c \ @@ -160,7 +143,7 @@ MCEDIT_SRCS= \ syntax.c \ wordproc.c -SRCS=$(MC_SRCS) $(PC_SRCS) $($(TARGET_OS)_SRCS) $(EXTRA_MC_SRCS) +SRCS=$(MC_SRCS) $(PC_SRCS) $(EXTRA_MC_SRCS) OBJS=$(addprefix $(OBJS_DIR)/, \ $(patsubst %.c,%.$(OBJ_SUFFIX),$(SRCS)))