3b1emu / file diff

     1.1 diff -r 566a09ee4068 -r 916a2c764bde Makefile
     1.2 --- a/Makefile	Sat Nov 27 11:30:19 2010 +0000
     1.3 +++ b/Makefile	Sun Nov 28 03:03:34 2010 +0000
     1.4 @@ -115,7 +115,7 @@
     1.5  TARGET		=	3b1emu
     1.6  
     1.7  # source files that produce object files
     1.8 -SRC			=	main.c musashi/m68kcpu.c musashi/m68kops.c
     1.9 +SRC			=	main.c musashi/m68kcpu.c musashi/m68kops.c musashi/m68kopac.c musashi/m68kopdm.c musashi/m68kopnz.c
    1.10  
    1.11  # source type - either "c" or "cpp" (C or C++)
    1.12  SRC_TYPE	=	c
    1.13 @@ -124,12 +124,12 @@
    1.14  EXT_OBJ		=
    1.15  # libraries to link in -- these will be specified as "-l" parameters, the -l
    1.16  # is prepended automatically
    1.17 -LIB			=	sdl
    1.18 +LIB			=
    1.19  # library paths -- where to search for the above libraries
    1.20 -LIBPATH		=	musashi
    1.21 +LIBPATH		=
    1.22  # include paths -- where to search for #include files (in addition to the
    1.23  # standard paths
    1.24 -INCPATH		=	musashi
    1.25 +INCPATH		=
    1.26  # garbage files that should be deleted on a 'make clean' or 'make tidy'
    1.27  GARBAGE		=	obj/musashi/m68kmake obj/musashi/m68kmake.exe obj/musashi/m68kmake.o
    1.28  
    1.29 @@ -143,6 +143,8 @@
    1.30  ENABLE_WX	=	no
    1.31  # wxWidgets: list of wxWidgets libraries to enable
    1.32  WX_LIBS		=	std
    1.33 +# SDL: set to "yes" to enable, anything else to disable
    1.34 +ENABLE_SDL	=	yes
    1.35  
    1.36  ####
    1.37  # Win32 target-specific settings
    1.38 @@ -273,6 +275,15 @@
    1.39  endif
    1.40  
    1.41  ####
    1.42 +# SDL support
    1.43 +####
    1.44 +ifeq ($(ENABLE_SDL),yes)
    1.45 +	LIBLNK		+=	`sdl-config --libs`
    1.46 +	CFLAGS		+=	`sdl-config --cflags`
    1.47 +endif
    1.48 +
    1.49 +
    1.50 +####
    1.51  # rules
    1.52  ####
    1.53  
    1.54 @@ -400,7 +411,7 @@
    1.55  obj/musashi/m68kmake:	obj/musashi/m68kmake.o
    1.56  	$(CC) $(CFLAGS) $(CPPFLAGS) obj/musashi/m68kmake.o -o $@
    1.57  # 68k CPU sources
    1.58 -src/musashi/m68kops.h src/musashi/m68kops.c:	obj/musashi/m68kmake src/musashi/m68k_in.c
    1.59 +src/musashi/m68kops.h src/musashi/m68kops.c src/musashi/m68kopac.c src/musashi/m68kopdm.c src/musashi/m68kopnz.c:	obj/musashi/m68kmake src/musashi/m68k_in.c
    1.60  	./obj/musashi/m68kmake src/musashi src/musashi/m68k_in.c
    1.61  
    1.62  ####