diff --git a/src/Makefile.am b/src/Makefile.am index 20cda0db5..32b6aa7bb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,7 @@ endif .rc.o: $(WINDRES) -o $@ $< -dosbox_SOURCES = dosbox.cpp save_state.cpp save_state.h miniunz.c minizip.c $(ico_stuff) +dosbox_SOURCES = dosbox.cpp save_state.cpp save_state.h $(ico_stuff) dosbox_LDADD = cpu/libcpu.a debug/libdebug.a dos/libdos.a fpu/libfpu.a hardware/libhardware.a shell/libshell.a gui/libgui.a \ ints/libints.a misc/libmisc.a hardware/serialport/libserial.a hardware/parport/libparallel.a \ libs/gui_tk/libgui_tk.a libs/porttalk/libporttalk.a \ diff --git a/src/Makefile.in b/src/Makefile.in index 02f50a232..d2c0b4bfd 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -66,10 +66,10 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am__dosbox_SOURCES_DIST = dosbox.cpp save_state.cpp save_state.h \ - miniunz.c minizip.c winres.rc + winres.rc @HAVE_WINDRES_TRUE@am__objects_1 = winres.$(OBJEXT) am_dosbox_OBJECTS = dosbox.$(OBJEXT) save_state.$(OBJEXT) \ - miniunz.$(OBJEXT) minizip.$(OBJEXT) $(am__objects_1) + $(am__objects_1) dosbox_OBJECTS = $(am_dosbox_OBJECTS) dosbox_DEPENDENCIES = cpu/libcpu.a debug/libdebug.a dos/libdos.a \ fpu/libfpu.a hardware/libhardware.a shell/libshell.a \ @@ -93,18 +93,6 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) AM_V_CXX = $(am__v_CXX_@AM_V@) @@ -118,6 +106,18 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(dosbox_SOURCES) DIST_SOURCES = $(am__dosbox_SOURCES_DIST) RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ @@ -297,7 +297,7 @@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include SUBDIRS = cpu debug dos fpu gui hardware libs ints misc shell platform @HAVE_WINDRES_TRUE@ico_stuff = winres.rc -dosbox_SOURCES = dosbox.cpp save_state.cpp save_state.h miniunz.c minizip.c $(ico_stuff) +dosbox_SOURCES = dosbox.cpp save_state.cpp save_state.h $(ico_stuff) dosbox_LDADD = cpu/libcpu.a debug/libdebug.a dos/libdos.a fpu/libfpu.a hardware/libhardware.a shell/libshell.a gui/libgui.a \ ints/libints.a misc/libmisc.a hardware/serialport/libserial.a hardware/parport/libparallel.a \ libs/gui_tk/libgui_tk.a libs/porttalk/libporttalk.a \ @@ -307,7 +307,7 @@ EXTRA_DIST = winres.rc dosbox.ico all: all-recursive .SUFFIXES: -.SUFFIXES: .c .cpp .o .obj .rc +.SUFFIXES: .cpp .o .obj .rc $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -391,24 +391,8 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dosbox.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/miniunz.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/minizip.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save_state.Po@am__quote@ -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` - .cpp.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po diff --git a/src/miniunz.c b/src/miniunz.c deleted file mode 100644 index cb270ab60..000000000 --- a/src/miniunz.c +++ /dev/null @@ -1,5 +0,0 @@ - -int my_miniunz(char ** savefile,const char * savefile2,const char * savedir) { - return 1; -} - diff --git a/src/minizip.c b/src/minizip.c deleted file mode 100644 index 72d0a7d37..000000000 --- a/src/minizip.c +++ /dev/null @@ -1,5 +0,0 @@ - -int my_minizip(char ** savefile,char ** savefile2) { - return 0; -} -