ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A slight reworking of the INTTYPES stuff. If Stella is built using the 

makefile, it's obviously using a UNIX/Posix build environment.  And since
inttypes.h is always available under Posix, the #define for HAVE_INTTYPES
can always be used.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@436 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2005-05-21 19:55:17 +00:00
parent 2df00cd64b
commit fe67d725df
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
stella/src/build/makefile
View File

@ -13,7 +13,7 @@
## See the file "license" for information on usage and redistribution of ## See the file "license" for information on usage and redistribution of
## this file, and for a DISCLAIMER OF ALL WARRANTIES. ## this file, and for a DISCLAIMER OF ALL WARRANTIES.
## ##
## $Id: makefile,v 1.83 2005-05-21 19:35:58 stephena Exp $ ## $Id: makefile,v 1.84 2005-05-21 19:55:17 stephena Exp $
##============================================================================ ##============================================================================
##============================================================================ ##============================================================================
@ -46,11 +46,6 @@ OPTIMIZATIONS =
### change to number of CPU's you have ### change to number of CPU's you have
NUMBER_CPU = 1 NUMBER_CPU = 1
### to explictly provide inttypes.h
### some platforms include it as part of another header, so including
### it again would cause an error
HAVE_INTTYPES = 1
##============================================================================ ##============================================================================
## All done, type make to get a list of frontends ## All done, type make to get a list of frontends
## No configurable options below this line ... ## No configurable options below this line ...
@ -110,10 +105,7 @@ ifdef SOUND_SUPPORT
OPTIONS += -DSOUND_SUPPORT OPTIONS += -DSOUND_SUPPORT
endif endif
ifdef SOUND_SUPPORT
OPTIONS += -DHAVE_INTTYPES
endif
default: default:
@echo "" @echo ""
@echo "To build Stella type: 'make <version>'" @echo "To build Stella type: 'make <version>'"
@ -132,7 +124,7 @@ default:
linux: linux:
$(MAKE) $(SMP) stella \ $(MAKE) $(SMP) stella \
EXE_NAME="stella" \ EXE_NAME="stella" \
OPTIONS="$(OPTIONS) -DBSPF_UNIX -DUNIX -DHAVE_GETTIMEOFDAY" \ OPTIONS="$(OPTIONS) -DBSPF_UNIX -DUNIX -DHAVE_GETTIMEOFDAY -DHAVE_INTTYPES" \
OBJS="$(OBJECTS) SettingsUNIX.o OSystemUNIX.o FSNodePOSIX.o" OBJS="$(OBJECTS) SettingsUNIX.o OSystemUNIX.o FSNodePOSIX.o"
linux-gl: linux-gl:
@ -140,20 +132,20 @@ linux-gl:
EXE_NAME="stella" \ EXE_NAME="stella" \
LDFLAGS="$(LDFLAGS) -L/usr/X11R6/lib" \ LDFLAGS="$(LDFLAGS) -L/usr/X11R6/lib" \
LDLIBS="$(LDLIBS) -lGL" \ LDLIBS="$(LDLIBS) -lGL" \
OPTIONS="$(OPTIONS) -DBSPF_UNIX -DUNIX -DHAVE_GETTIMEOFDAY -DDISPLAY_OPENGL" \ OPTIONS="$(OPTIONS) -DBSPF_UNIX -DUNIX -DHAVE_GETTIMEOFDAY -DHAVE_INTTYPES -DDISPLAY_OPENGL" \
OBJS="$(OBJECTS) FrameBufferGL.o SettingsUNIX.o OSystemUNIX.o FSNodePOSIX.o" OBJS="$(OBJECTS) FrameBufferGL.o SettingsUNIX.o OSystemUNIX.o FSNodePOSIX.o"
win32: win32:
$(MAKE) $(SMP) stella \ $(MAKE) $(SMP) stella \
EXE_NAME="stella.exe" \ EXE_NAME="stella.exe" \
OPTIONS="$(OPTIONS) -DBSPF_WIN32 -DWIN32" \ OPTIONS="$(OPTIONS) -DBSPF_WIN32 -DWIN32 -DHAVE_INTTYPES" \
OBJS="$(OBJECTS) SettingsWin32.o OSystemWin32.o FSNodeWin32.o" OBJS="$(OBJECTS) SettingsWin32.o OSystemWin32.o FSNodeWin32.o"
win32-gl: win32-gl:
$(MAKE) $(SMP) stella \ $(MAKE) $(SMP) stella \
EXE_NAME="stella.exe" \ EXE_NAME="stella.exe" \
LDLIBS="$(LDLIBS) -lopengl32" \ LDLIBS="$(LDLIBS) -lopengl32" \
OPTIONS="$(OPTIONS) -DBSPF_WIN32 -DWIN32 -DDISPLAY_OPENGL -DTEXTURES_ARE_LOST" \ OPTIONS="$(OPTIONS) -DBSPF_WIN32 -DWIN32 -DHAVE_INTTYPES -DDISPLAY_OPENGL -DTEXTURES_ARE_LOST" \
OBJS="$(OBJECTS) FrameBufferGL.o SettingsWin32.o OSystemWin32.o FSNodeWin32.o" OBJS="$(OBJECTS) FrameBufferGL.o SettingsWin32.o OSystemWin32.o FSNodeWin32.o"