Resources support for RSX
Improved support for MinGW and RSX
Этот коммит содержится в:
Pavel Machek
родитель
70db5514a2
Коммит
5899d6b714
@ -1,3 +1,10 @@
|
||||
Tue May 12 17:16:43 1998 Pavel Roskin <pavel.roskin@ecsoft.co.uk>
|
||||
|
||||
* Makefile.RSX, mc.rc: Resources support for RSX
|
||||
|
||||
* Makefile.PC, *.c: Some includes corrected for MinGW
|
||||
compatability (dir.h exists both in mc and MinGW)
|
||||
|
||||
Fri May 8 10:49:21 1998 Pavel Roskin <pavel.roskin@ecsoft.co.uk>
|
||||
|
||||
* Makefile.PC, Makefile.MIN: support for custom extension
|
||||
|
||||
@ -35,11 +35,11 @@ MC_EXE=$(OBJS_DIR)/mc.exe
|
||||
# --- Midnight Defines
|
||||
COMMON_DEFINES=-DMC_$(TARGET_OS) $(SPECIFIC_DEFINES)
|
||||
MC_DEFINES=$(COMMON_DEFINES) -DHAVE_CONFIG_H
|
||||
MC_INCLUDES=-I$(MC_SRC_DIR) -I$(MC_PC_DIR) -I$(SLANG_SRC_DIR)
|
||||
MC_INCLUDES=-I$(MC_PC_DIR) -I$(SLANG_SRC_DIR)
|
||||
SLANG_DEFINES=$(COMMON_DEFINES)
|
||||
SLANG_INCLUDES=-I$(MC_PC_DIR) -I$(SLANG_SRC_DIR)
|
||||
MCEDIT_DEFINES=$(COMMON_DEFINES) -DHAVE_CONFIG_H
|
||||
MCEDIT_INCLUDES=-I$(MC_PC_DIR) -I$(MC_SRC_DIR)/.. -I$(SLANG_SRC_DIR)
|
||||
MCEDIT_INCLUDES=-I$(MC_PC_DIR) -I$(SLANG_SRC_DIR)
|
||||
|
||||
CFLAGS=$(SPECIFIC_MC_CFLAGS) $(MC_INCLUDES) $(MC_DEFINES) -c
|
||||
SLANG_CFLAGS=$(SPECIFIC_SLANG_CFLAGS) $(SLANG_INCLUDES) $(SLANG_DEFINES) -c
|
||||
|
||||
@ -16,8 +16,8 @@ OBJ_SUFFIX=o
|
||||
OBJ_PLACE=-o
|
||||
EXE_PLACE=-o
|
||||
# Just comment RSC out if you have problems with resources
|
||||
# RSC=rc.exe
|
||||
# RES_PLACE=-fo
|
||||
RSC=grc.exe
|
||||
RES_PLACE=-o
|
||||
|
||||
# ---- Compiler-specific optional stuff
|
||||
MC_MISC_CFLAGS=-Zrsx32
|
||||
@ -31,7 +31,7 @@ SPECIFIC_MC_CFLAGS=-g -O0 $(MC_MISC_CFLAGS)
|
||||
SPECIFIC_MC_LFLAGS_EXTRA=
|
||||
SPECIFIC_SLANG_CFLAGS=$(SPECIFIC_MC_CFLAGS)
|
||||
SPECIFIC_MCEDIT_CFLAGS=$(SPECIFIC_MC_CFLAGS)
|
||||
RC_DEFINES=-D_DEBUG
|
||||
RC_DEFINES=
|
||||
else
|
||||
# ---- Release build
|
||||
OBJS_DIR=release
|
||||
@ -41,7 +41,7 @@ SPECIFIC_MC_CFLAGS=-O2 $(MC_MISC_CFLAGS)
|
||||
SPECIFIC_MC_LFLAGS_EXTRA=
|
||||
SPECIFIC_SLANG_CFLAGS=$(SPECIFIC_MC_CFLAGS)
|
||||
SPECIFIC_MCEDIT_CFLAGS=$(SPECIFIC_MC_CFLAGS)
|
||||
RC_DEFINES=-DRELEASE=$(RELEASE)
|
||||
RC_DEFINES=
|
||||
endif
|
||||
|
||||
# ---- Compiler independent defines
|
||||
@ -54,3 +54,6 @@ MC_LIBS=-lvideont -ladvapi32
|
||||
|
||||
$(MC_EXE): $(MC_RES) $(OBJS) $(MCEDIT_OBJS) $(SLANG_OBJS)
|
||||
$(LINK) $(EXE_PLACE) $(MC_EXE) $(SPECIFIC_MC_LFLAGS) $+ $(MC_LIBS)
|
||||
|
||||
resources: $(MC_RES)
|
||||
rsrc $(MC_EXE) $(MC_RES)
|
||||
|
||||
30
pc/chmod.c
30
pc/chmod.c
@ -33,22 +33,22 @@
|
||||
#include <io.h>
|
||||
#include <sys\types.h>
|
||||
#include <sys\stat.h>
|
||||
#include "tty.h"
|
||||
#include "mad.h"
|
||||
#include "util.h"
|
||||
#include "win.h"
|
||||
#include "color.h"
|
||||
#include "dlg.h"
|
||||
#include "widget.h"
|
||||
#include "dialog.h" /* For do_refresh() */
|
||||
#include "../src/tty.h"
|
||||
#include "../src/mad.h"
|
||||
#include "../src/util.h"
|
||||
#include "../src/win.h"
|
||||
#include "../src/color.h"
|
||||
#include "../src/dlg.h"
|
||||
#include "../src/widget.h"
|
||||
#include "../src/dialog.h" /* For do_refresh() */
|
||||
|
||||
#include "dir.h"
|
||||
#include "panel.h" /* Needed for the externs */
|
||||
#include "file.h"
|
||||
#include "main.h"
|
||||
#include "chmod.h"
|
||||
#include "achown.h"
|
||||
#include "chown.h"
|
||||
#include "../src/dir.h"
|
||||
#include "../src/panel.h" /* Needed for the externs */
|
||||
#include "../src/file.h"
|
||||
#include "../src/main.h"
|
||||
#include "../src/chmod.h"
|
||||
#include "../src/achown.h"
|
||||
#include "../src/chown.h"
|
||||
|
||||
#ifdef _OS_NT
|
||||
#define FILE_ARCHIVED FILE_ATTRIBUTE_ARCHIVE
|
||||
|
||||
@ -27,10 +27,10 @@
|
||||
|
||||
int cons_saver_pid = 1;
|
||||
|
||||
#include "tty.h"
|
||||
#include "util.h"
|
||||
#include "win.h"
|
||||
#include "cons.saver.h"
|
||||
#include "../src/tty.h"
|
||||
#include "../src/util.h"
|
||||
#include "../src/win.h"
|
||||
#include "../src/cons.saver.h"
|
||||
|
||||
signed char console_flag = 1;
|
||||
static HANDLE hSaved, hNew;
|
||||
|
||||
24
pc/drive.c
24
pc/drive.c
@ -28,18 +28,18 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include "tty.h"
|
||||
#include "mad.h"
|
||||
#include "util.h"
|
||||
#include "win.h"
|
||||
#include "color.h"
|
||||
#include "dlg.h"
|
||||
#include "widget.h"
|
||||
#include "dialog.h"
|
||||
#include "dir.h"
|
||||
#include "panel.h"
|
||||
#include "main.h"
|
||||
#include "cmd.h"
|
||||
#include "../src/tty.h"
|
||||
#include "../src/mad.h"
|
||||
#include "../src/util.h"
|
||||
#include "../src/win.h"
|
||||
#include "../src/color.h"
|
||||
#include "../src/dlg.h"
|
||||
#include "../src/widget.h"
|
||||
#include "../src/dialog.h"
|
||||
#include "../src/dir.h"
|
||||
#include "../src/panel.h"
|
||||
#include "../src/main.h"
|
||||
#include "../src/cmd.h"
|
||||
|
||||
struct Dlg_head *drive_dlg;
|
||||
WPanel *this_panel;
|
||||
|
||||
10
pc/key_nt.c
10
pc/key_nt.c
@ -25,12 +25,12 @@
|
||||
|
||||
#include <windows.h>
|
||||
#include <stdio.h>
|
||||
#include "mouse.h"
|
||||
#include "global.h"
|
||||
#include "main.h"
|
||||
#include "key.h"
|
||||
#include "../src/mouse.h"
|
||||
#include "../src/global.h"
|
||||
#include "../src/main.h"
|
||||
#include "../src/key.h"
|
||||
#include "../vfs/vfs.h"
|
||||
#include "tty.h"
|
||||
#include "../src/tty.h"
|
||||
#include "trace_nt.h"
|
||||
|
||||
/* Global variables */
|
||||
|
||||
6
pc/mc.rc
6
pc/mc.rc
@ -1,9 +1,7 @@
|
||||
#ifdef WINDRES
|
||||
# include "../VERSION"
|
||||
#else
|
||||
#include "../VERSION"
|
||||
#ifndef WINDRES
|
||||
# include "windows.h"
|
||||
# include "winver.h"
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
/* English (U.S.) resources */
|
||||
|
||||
@ -19,14 +19,14 @@
|
||||
|
||||
#include <config.h>
|
||||
#include <stdio.h>
|
||||
#include "tty.h"
|
||||
#include "mad.h"
|
||||
#include "color.h"
|
||||
#include "util.h"
|
||||
#include "mouse.h" /* Gpm_Event is required in key.h */
|
||||
#include "key.h" /* define_sequence */
|
||||
#include "main.h" /* extern: force_colors */
|
||||
#include "win.h" /* do_exit_ca_mode */
|
||||
#include "../src/tty.h"
|
||||
#include "../src/mad.h"
|
||||
#include "../src/color.h"
|
||||
#include "../src/util.h"
|
||||
#include "../src/mouse.h" /* Gpm_Event is required in key.h */
|
||||
#include "../src/key.h" /* define_sequence */
|
||||
#include "../src/main.h" /* extern: force_colors */
|
||||
#include "../src/win.h" /* do_exit_ca_mode */
|
||||
|
||||
#ifdef HAVE_SLANG
|
||||
|
||||
|
||||
13
pc/util_nt.c
13
pc/util_nt.c
@ -34,8 +34,8 @@
|
||||
#include <sys/stat.h>
|
||||
#include <stdarg.h>
|
||||
#include <process.h>
|
||||
#include <fs.h>
|
||||
#include "util.h"
|
||||
#include "../src/fs.h"
|
||||
#include "../src/util.h"
|
||||
#include "util_win32.h"
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
@ -196,10 +196,12 @@ char *tilde_expand (char *directory)
|
||||
/* sleep: Call Windows API.
|
||||
Can't do simple define. That would need <windows.h> in every source
|
||||
*/
|
||||
#ifndef __EMX__
|
||||
void sleep(unsigned long dwMiliSecs)
|
||||
{
|
||||
Sleep(dwMiliSecs);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Canonicalize path, and return a new path. Do everything in situ.
|
||||
The new path differs from path in:
|
||||
@ -295,7 +297,10 @@ int mc_rmdir (char *path)
|
||||
if (win32_GetPlatform() == OS_Win95) {
|
||||
if (rmdir(path)) {
|
||||
SetLastError (ERROR_DIR_NOT_EMPTY);
|
||||
_doserrno = ERROR_DIR_NOT_EMPTY; /* FIXME: We are always saying the same thing! */
|
||||
#ifndef __EMX__
|
||||
/* FIXME: We are always saying the same thing! */
|
||||
_doserrno = ERROR_DIR_NOT_EMPTY;
|
||||
#endif
|
||||
errno = ENOTEMPTY;
|
||||
return -1;
|
||||
} else
|
||||
@ -602,7 +607,7 @@ int vfs_file_is_ftp (char *filename)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int mc_utime (char *path, struct utimbuf *times)
|
||||
int mc_utime (char *path, void *times)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
Загрузка…
Ссылка в новой задаче
Block a user