WebSVN – Kolibri OS – Path Comparison – / – /programs/ Rev 6745 and /programs/ Rev 6744

Regard whitespace Rev 6745 → Rev 6744

/programs/fs/unzip60/kolibri/Makefile.gcc.static
File deleted

/programs/fs/unzip60/kolibri/Makefile.gcc.shared
File deleted

 /programs/fs/unzip60/kolibri/Makefile.gcc
 ,7 → 19,6
 SDK_DIR:= $(abspath ../../../contrib/sdk)
 NOASM=1
 CC_CPU_OPT=-march=pentium
-#USEZLIB=1
 ### Optional section
 ,7 → 94,7
 endif
 endif
 ### kolibri specific
-INCLUDES= -I $(SDK_DIR)/sources/newlib/libc/include -I $(SDK_DIR)/sources/zlib
+INCLUDES= -I $(SDK_DIR)/sources/newlib/libc/include
 LIBPATH = -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/mingw32/lib
 CC_ENVIR_OPT = -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -DKOS32 \
 ,16 → 152,15
 # Other specific options
 CC_SPECIFIC_OPT = -c $(CC_ENVIR_OPT)
 AS_SPECIFIC_OPT = -c
-LD_SPECIFIC_OPT = -o $@ -static -S -nostdlib -T $(SDK_DIR)/sources/newlib/app-dynamic.lds \
+LD_SPECIFIC_OPT = -o $@ -static -S -nostdlib -T $(SDK_DIR)/lib/app-dynamic.lds \
           --image-base 0 $(LIBPATH)
 # Libraries for the debug & release version
 # (GCC 2.95 and newer does not require the system library specifications)
-# -lapp only for gcc 4.8
 ifdef USEZLIB
-LD_RELEASE_LIBS = -lz -lgcc -ldll -lc.dll -lapp
+LD_RELEASE_LIBS = -lz -lgcc -ldll -lc.dll
 else
-LD_RELEASE_LIBS = -lgcc -ldll -lc.dll -lapp
+LD_RELEASE_LIBS = -lgcc -ldll -lc.dll
 endif
 LD_DEBUG_LIBS = $(LD_RELEASE_LIBS)
 ,7 → 169,7
 # Suffixes
 OBJ = .o
-EXE = .
+EXE = .exe
 .SUFFIXES: .c .S $(OBJ) $(EXE)
 .PHONY: FORCE
 ,7 → 273,7
 all:    unzip$(EXE)
 unzip$(EXE): $(OBJU) $(LIBBZIP2)
-        $(LD) $(LDFLAGS) $(LDVER) $(OBJU) $(LD_BZ2LIB) $(LDLIBS) -Map=unzip.map
+        $(LD) $(LDFLAGS) $(LDVER) $(OBJU) $(LD_BZ2LIB) $(LDLIBS) -Map=unzip.exe.map
         kos32-objcopy $@ -O binary
 unzipsfx$(EXE): $(OBJX) $(LIBBZIP2X)

 /programs/fs/unzip60/kolibri/kos32.c
 ,21 → 11,14
 Contains:
     version()
     mapattr()
-    mapname()
     checkdir()
-    close_outfile()
-    get_extattribs()
-    do_wild()
-todo
-        russian filenames in arh
-        datetime restore
-        overwrite request not in stderr
-        too many open files error EMFILE when DEBUG - error in newlib open. fixed
-        -d dir error.  Use -ddir or -d dir/
-        release, sizing removing old compression methods or zlib
+extract.o:extract.c:(.text+0x1410): undefined reference to `mapname'
+extract.o:extract.c:(.text+0x241d): undefined reference to `close_outfile'
+extract.o:extract.c:(.text+0x2e09): undefined reference to `checkdir'
+process.o:process.c:(.text+0x13e9): undefined reference to `checkdir'
+process.o:process.c:(.text+0x15a1): undefined reference to `do_wild'
+kolibri\makefile.gcc:276: recipe for target 'unzip.exe' failed
 */
 #define FATTR   FS_HIDDEN+FS_SYSTEM+FS_SUBDIR
 ,7 → 770,6
 #if (defined(NO_FCHOWN))
     fclose(G.outfile);
-    Trace((stdout, "File (%s) closed\n", FnFilter1(G.filename)));
 #endif
 // kos. add set file datetime ?

 /programs/fs/unzip60/kolibri/config.h
 ,9 → 13,9
 #include <unistd.h>
 #include <dirent.h>
-// moved to makefile, in kilibri leads to bug EMFILES
-//#define DEBUG
+#define DEBUG
 #define DIR_END       '/'
 #define NO_STRNICMP
 #define STRNICMP zstrnicmp

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6745 → Rev 6744