Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6727 → Rev 6745

/programs/fs/unzip60/kolibri/Makefile.gcc
19,6 → 19,7
SDK_DIR:= $(abspath ../../../contrib/sdk)
NOASM=1
CC_CPU_OPT=-march=pentium
#USEZLIB=1
 
### Optional section
 
94,7 → 95,7
endif
endif
### kolibri specific
INCLUDES= -I $(SDK_DIR)/sources/newlib/libc/include
INCLUDES= -I $(SDK_DIR)/sources/newlib/libc/include -I $(SDK_DIR)/sources/zlib
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 \
152,15 → 153,16
# Other specific options
CC_SPECIFIC_OPT = -c $(CC_ENVIR_OPT)
AS_SPECIFIC_OPT = -c
LD_SPECIFIC_OPT = -o $@ -static -S -nostdlib -T $(SDK_DIR)/lib/app-dynamic.lds \
LD_SPECIFIC_OPT = -o $@ -static -S -nostdlib -T $(SDK_DIR)/sources/newlib/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
LD_RELEASE_LIBS = -lz -lgcc -ldll -lc.dll -lapp
else
LD_RELEASE_LIBS = -lgcc -ldll -lc.dll
LD_RELEASE_LIBS = -lgcc -ldll -lc.dll -lapp
endif
LD_DEBUG_LIBS = $(LD_RELEASE_LIBS)
 
169,7 → 171,7
 
# Suffixes
OBJ = .o
EXE = .exe
EXE = .
 
.SUFFIXES: .c .S $(OBJ) $(EXE)
.PHONY: FORCE
273,7 → 275,7
all: unzip$(EXE)
 
unzip$(EXE): $(OBJU) $(LIBBZIP2)
$(LD) $(LDFLAGS) $(LDVER) $(OBJU) $(LD_BZ2LIB) $(LDLIBS) -Map=unzip.exe.map
$(LD) $(LDFLAGS) $(LDVER) $(OBJU) $(LD_BZ2LIB) $(LDLIBS) -Map=unzip.map
kos32-objcopy $@ -O binary
 
unzipsfx$(EXE): $(OBJX) $(LIBBZIP2X)