[rott-commits] r260 - trunk/rott

[DONOTREPLY at icculus.org]

Author: fabian
Date: 2011-06-08 08:34:21 -0400 (Wed, 08 Jun 2011)
New Revision: 260

Removed:
   trunk/rott/Makefile.cygwin
Modified:
   trunk/rott/Makefile
   trunk/rott/dosutil.c
Log:
Remove the USE_EXECINFO macro, it was only used in one occation and
was only unset if built under cygwin. Directly check against __CYGWIN__
instead. Also, remove the now obsoleted Makefile.cygwin.



Modified: trunk/rott/Makefile
===================================================================
--- trunk/rott/Makefile	2011-04-23 17:48:12 UTC (rev 259)
+++ trunk/rott/Makefile	2011-06-08 12:34:21 UTC (rev 260)
@@ -8,7 +8,6 @@
 CFLAGS += $(EXTRACFLAGS)
 
 CPPFLAGS += -DUSE_SDL=1
-CPPFLAGS += -DUSE_EXECINFO=1
 CPPFLAGS += -DPLATFORM_UNIX=1
 CPPFLAGS += $(EXTRACPPFLAGS)
 

Deleted: trunk/rott/Makefile.cygwin
===================================================================
--- trunk/rott/Makefile.cygwin	2011-04-23 17:48:12 UTC (rev 259)
+++ trunk/rott/Makefile.cygwin	2011-06-08 12:34:21 UTC (rev 260)
@@ -1,123 +0,0 @@
-#-----------------------------------------------------------------------------#
-# ROTT makefile.
-#-----------------------------------------------------------------------------#
-
-
-#-----------------------------------------------------------------------------#
-# If this makefile fails to detect Cygwin correctly, or you want to force
-#  the build process's behaviour, set it to "true" or "false" (w/o quotes).
-#-----------------------------------------------------------------------------#
-#cygwin := true
-#cygwin := false
-cygwin := autodetect
-
-# you only need to set these for Cygwin at the moment.
-SDL_INC_DIR = /cygdrive/c/SDL/include
-SDL_LIB_DIR = /cygdrive/c/SDL/lib
-
-
-# Don't touch anything below this line unless you know what you're doing.
-
-ifeq ($(strip $(cygwin)),autodetect)
-  ifneq ($(strip $(shell gcc -v 2>&1 |grep "cygwin")),)
-    cygwin := true
-  else
-    cygwin := false
-  endif
-endif
-
-
-ifeq ($(strip $(cygwin)),true)
-  ifeq ($(strip $(SDL_INC_DIR)),please_set_me_cygwin_users)
-    $(error Cygwin users need to set the SDL_INC_DIR envr var.)
-  else
-    SDL_CFLAGS := -I$(SDL_INC_DIR)
-  endif
-
-  ifeq ($(strip $(SDL_LIB_DIR)),please_set_me_cygwin_users)
-    $(error Cygwin users need to set the SDL_LIB_DIR envr var.)
-  else
-    SDL_LDFLAGS := -L$(SDL_LIB_DIR) -lSDL
-  endif
-else
-  SDL_CFLAGS := $(shell sdl-config --cflags)
-  SDL_LDFLAGS := $(shell sdl-config --libs)
-  EXTRACFLAGS += -DUSE_EXECINFO=1
-endif
-
-
-CC = gcc
-CFLAGS += -g -W -Wall -Wno-unused
-ALL_CFLAGS = $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 $(CFLAGS) $(EXTRACFLAGS)
-LDFLAGS += -Wl,-E
-LDLIBS = $(LDFLAGS) $(SDL_LDFLAGS) -lSDL -lSDL_mixer $(EXTRALDFLAGS)
-
-%.o: %.c
-	$(CC) $(ALL_CFLAGS) -c $< -o $@
-
-all: rott
-
-audiolib/audiolib.a:
-	$(MAKE) -C audiolib CC="$(CC)" CFLAGS="$(ALL_CFLAGS)" LDLIBS="$(LDLIBS)"
-
-rott: 	\
-	cin_actr.o \
-	cin_efct.o \
-	cin_evnt.o \
-	cin_glob.o \
-	cin_main.o \
-	cin_util.o \
-	dosutil.o \
-	engine.o \
-	isr.o \
-	modexlib.o \
-	rt_actor.o \
-	rt_battl.o \
-	rt_build.o \
-	rt_cfg.o \
-	rt_crc.o \
-	rt_com.o \
-	rt_debug.o \
-	rt_dmand.o \
-	rt_door.o \
-	rt_draw.o \
-	rt_floor.o \
-	rt_game.o \
-	rt_in.o \
-	rt_main.o \
-	rt_map.o \
-	rt_menu.o \
-	rt_msg.o \
-	rt_net.o \
-	rt_playr.o \
-	rt_rand.o \
-	rt_scale.o \
-	rt_sound.o \
-	rt_spbal.o \
-	rt_sqrt.o \
-	rt_stat.o \
-	rt_state.o \
-	rt_str.o \
-	rt_swift.o \
-	rt_ted.o \
-	rt_util.o \
-	rt_view.o \
-	rt_vid.o \
-	rt_err.o \
-	scriplib.o \
-	w_wad.o \
-	watcom.o \
-	z_zone.o \
-	byteordr.o \
-	dukemusc.o \
-	audiolib/audiolib.a \
-	winrott.o
-	$(CC) $^ $(LDLIBS) -o $@
-
-clean:
-	$(MAKE) -C audiolib clean
-	rm -rf rott rott.exe *.o
-
-distclean: clean
-	$(MAKE) -C audiolib distclean
-	rm -rf *~

Modified: trunk/rott/dosutil.c
===================================================================
--- trunk/rott/dosutil.c	2011-04-23 17:48:12 UTC (rev 259)
+++ trunk/rott/dosutil.c	2011-06-08 12:34:21 UTC (rev 260)
@@ -197,7 +197,7 @@
 	printf ("\033[m");
 }
 
-#if (USE_EXECINFO == 1) && !defined(__MINGW32__)
+#if !defined(__CYGWIN__) && !defined(__MINGW32__)
 #include <execinfo.h>
 
 void print_stack (int level)