diff options
author | 2010-01-16 02:20:45 +0000 | |
---|---|---|
committer | 2010-01-16 02:20:45 +0000 | |
commit | f6c832ea90a9c69c95b4006ff328867bb41ebe5c (patch) | |
tree | c3d733a6a71ccce91a8d61921837f60a91433044 /src/osd | |
parent | d35a800134bd09dfc8cf5df9d35e2fd3ba150f92 (diff) |
- testkeys now builds again
- for unix targets, added a depend rule to sdl.mak which builds a .depend file.
Diffstat (limited to 'src/osd')
-rw-r--r-- | src/osd/sdl/sdl.mak | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index 9d6ca008c36..027b36aed61 100644 --- a/src/osd/sdl/sdl.mak +++ b/src/osd/sdl/sdl.mak @@ -135,11 +135,6 @@ ifeq ($(TARGETOS),unix) SYNC_IMPLEMENTATION = tc endif -ifeq ($(TARGETOS),linux) -TARGETOS = unix -SYNC_IMPLEMENTATION = tc -endif - ifeq ($(TARGETOS),freebsd) TARGETOS = unix SYNC_IMPLEMENTATION = ntc @@ -388,6 +383,8 @@ LIBS += `sdl-config --libs` $(OBJ)/emu/cpu/h6280/6280dasm.o : CDEFS += -D__STRICT_ANSI__ endif # OS2 +OSDCLEAN = sdlclean + TOOLS += \ testkeys$(EXE) @@ -412,17 +409,33 @@ $(LIBOSD): $(OSDOBJS) $(SDLOBJ)/testkeys.o: $(SDLSRC)/testkeys.c @echo Compiling $<... - $(CC) $(CCOMFLAGS) $(DEFS) -c $< -o $@ + $(CC) $(CFLAGS) $(DEFS) -c $< -o $@ TESTKEYSOBJS = \ $(SDLOBJ)/testkeys.o \ -testkeys$(EXE): $(TESTKEYSOBJS) $(LIBUTIL) +testkeys$(EXE): $(TESTKEYSOBJS) $(LIBUTIL) $(LIBOCORE) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(SDLMAIN) $(SDLOBJ)/strconv.o $(LIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + +sdlclean: + rm -f .depend testlib: -echo LIBS: $(LIBS) -echo DEFS: $(DEFS) -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 |