mirror of
https://github.com/holub/mame
synced 2025-05-21 13:18:56 +03:00
- testkeys now builds again
- for unix targets, added a depend rule to sdl.mak which builds a .depend file.
This commit is contained in:
parent
d35a800134
commit
f6c832ea90
@ -135,11 +135,6 @@ ifeq ($(TARGETOS),unix)
|
|||||||
SYNC_IMPLEMENTATION = tc
|
SYNC_IMPLEMENTATION = tc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(TARGETOS),linux)
|
|
||||||
TARGETOS = unix
|
|
||||||
SYNC_IMPLEMENTATION = tc
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(TARGETOS),freebsd)
|
ifeq ($(TARGETOS),freebsd)
|
||||||
TARGETOS = unix
|
TARGETOS = unix
|
||||||
SYNC_IMPLEMENTATION = ntc
|
SYNC_IMPLEMENTATION = ntc
|
||||||
@ -388,6 +383,8 @@ LIBS += `sdl-config --libs`
|
|||||||
$(OBJ)/emu/cpu/h6280/6280dasm.o : CDEFS += -D__STRICT_ANSI__
|
$(OBJ)/emu/cpu/h6280/6280dasm.o : CDEFS += -D__STRICT_ANSI__
|
||||||
endif # OS2
|
endif # OS2
|
||||||
|
|
||||||
|
OSDCLEAN = sdlclean
|
||||||
|
|
||||||
TOOLS += \
|
TOOLS += \
|
||||||
testkeys$(EXE)
|
testkeys$(EXE)
|
||||||
|
|
||||||
@ -412,17 +409,33 @@ $(LIBOSD): $(OSDOBJS)
|
|||||||
|
|
||||||
$(SDLOBJ)/testkeys.o: $(SDLSRC)/testkeys.c
|
$(SDLOBJ)/testkeys.o: $(SDLSRC)/testkeys.c
|
||||||
@echo Compiling $<...
|
@echo Compiling $<...
|
||||||
$(CC) $(CCOMFLAGS) $(DEFS) -c $< -o $@
|
$(CC) $(CFLAGS) $(DEFS) -c $< -o $@
|
||||||
|
|
||||||
TESTKEYSOBJS = \
|
TESTKEYSOBJS = \
|
||||||
$(SDLOBJ)/testkeys.o \
|
$(SDLOBJ)/testkeys.o \
|
||||||
|
|
||||||
testkeys$(EXE): $(TESTKEYSOBJS) $(LIBUTIL)
|
testkeys$(EXE): $(TESTKEYSOBJS) $(LIBUTIL) $(LIBOCORE)
|
||||||
@echo Linking $@...
|
@echo Linking $@...
|
||||||
$(LD) $(LDFLAGS) $^ $(SDLMAIN) $(SDLOBJ)/strconv.o $(LIBS) -o $@
|
$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
|
||||||
|
|
||||||
|
sdlclean:
|
||||||
|
rm -f .depend
|
||||||
|
|
||||||
testlib:
|
testlib:
|
||||||
-echo LIBS: $(LIBS)
|
-echo LIBS: $(LIBS)
|
||||||
-echo DEFS: $(DEFS)
|
-echo DEFS: $(DEFS)
|
||||||
-echo CORE: $(OSDCOREOBJS)
|
-echo CORE: $(OSDCOREOBJS)
|
||||||
|
|
||||||
|
ifneq ($(TARGETOS),win32)
|
||||||
|
depend:
|
||||||
|
rm -f .depend
|
||||||
|
@for i in `find src -name "*.c"` ; do \
|
||||||
|
echo processing $$i; \
|
||||||
|
mt=`echo $$i | sed -e "s/\\.c/\\.o/" -e "s!^src/!$(OBJ)/!"` ; \
|
||||||
|
g++ -MM -MT $$mt $(CDEFS) $(CCOMFLAGS) $$i 2>/dev/null \
|
||||||
|
| sed -e "s!$$i!!g" >> .depend ; \
|
||||||
|
done
|
||||||
|
|
||||||
|
-include .depend
|
||||||
|
|
||||||
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user