b7a81af86c
Changes are - New manual and new SourceForge page. Other documentation deprecated. - Added project files for MS VC++, and fix warnings provoked by it. - Further split of windowing/non-windowing functionality to aid division of architecture-independent files. - Windows version made independent from Cygwin. - Windows support imported from eQRD version. Features brought inline with other versions, including icon change, and same format for choices file. - Entirety of build warnings fixed under GCC, including those that appeared from turning on harsh warning flags. - General tidying. - Makefile rearranged so that default Unix builds are more sensible. - Support for running RISC OS, by Alex Macfarlane Smith and Peter Naulls - Split of the windowing aspects of the code, to allow independent development. - Some small speed ups. - Source code tidying and warning fixes.
45 lines
1.2 KiB
Text
45 lines
1.2 KiB
Text
$NetBSD: patch-aa,v 1.2 2004/12/03 15:15:23 skrll Exp $
|
|
|
|
--- Makefile.orig 2002-05-05 23:09:39.000000000 +0100
|
|
+++ Makefile
|
|
@@ -36,15 +36,14 @@ WARN = -Wall -Wno-return-type -Wno-unkno
|
|
|
|
|
|
# add -DHOST_BIGENDIAN for big endian hosts, e.g. Sun, SGI, HP
|
|
-CFLAGS = -O3 -D$(ENDIAN) $(CFL) -DNOOS -DNOFPE $(WARN) \
|
|
- -I$(SYSTEM) -Iarch -funroll-loops -fexpensive-optimizations -ffast-math \
|
|
- -fomit-frame-pointer -frerun-cse-after-loop
|
|
+#CFLAGS = -O3 -D$(ENDIAN) $(CFL) -DNOOS -DNOFPE $(WARN) \
|
|
+# -I$(SYSTEM) -Iarch -funroll-loops -fexpensive-optimizations -ffast-math \
|
|
+# -fomit-frame-pointer -frerun-cse-after-loop
|
|
+CFLAGS = -g -D$(ENDIAN) $(CFL) -DNOOS -DNOFPE $(WARN) -I$(SYSTEM) -Iarch
|
|
|
|
|
|
|
|
-prefix=/usr/local
|
|
-
|
|
-INSTALL_DIR = $(prefix)/bin
|
|
+INSTALL_DIR = $(PREFIX)/bin
|
|
INSTALL=cp
|
|
|
|
|
|
@@ -82,8 +81,8 @@ TARGET=!ArcEm/arcem
|
|
endif
|
|
|
|
ifeq (${SYSTEM},X)
|
|
-CFLAGS += -DSYSTEM_X -I/usr/X11R6/include
|
|
-LIBS += -L/usr/X11R6/lib -lXext -lX11
|
|
+CFLAGS += -DSYSTEM_X -I${X11BASE}/include
|
|
+LIBS += -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXext -lX11
|
|
endif
|
|
|
|
ifeq (${SYSTEM},win)
|
|
@@ -110,7 +109,7 @@ VER=1.0
|
|
all: $(TARGET)
|
|
|
|
install: all
|
|
- $(INSTALL) armul $(INSTALL_DIR)
|
|
+ $(INSTALL) arcem $(INSTALL_DIR)
|
|
|
|
$(TARGET): $(OBJS) $(MODEL).o
|
|
$(CC) $(OBJS) $(LIBS) $(MODEL).o -o $@
|