mirror of
https://github.com/winscp/winscp.git
synced 2026-10-24 02:28:55 +03:00
For forward compatibility with bcc32c, compiling files one-by-one and putting flags first
bcc32c does not seem to support -n parameter and needs some flags like -cc1 first Source commit: d73c9226e60be3eb222e826195804c00315e8384
This commit is contained in:
@@ -23,5 +23,5 @@ $(PROJECT): $(OBJFILES)
|
||||
# ---------------------------------------------------------------------------
|
||||
.path.c = ..\lib
|
||||
.c.obj:
|
||||
$(CC) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH:;= -I) $(DEFINESARGS) -n$(@D) {$< }
|
||||
$(CC) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH:;= -I) $(DEFINESARGS) -o $@ $<
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@@ -5,7 +5,7 @@ DEFINES = WIN32;WIN32_LEAN_AND_MEAN;WINSCP;NE_LFS
|
||||
WARNINGS = -w-aus -w-par
|
||||
# Compile like C++ (it's probably only to support newer features and won't be needed with Clang)
|
||||
CFLAG = -P
|
||||
CFLAG = -D$(DEFINES:;= -D) $(WARNINGS) $(CFLAG) $(CFLAG_COMMON)
|
||||
CFLAG = $(CFLAG_COMMON) $(CFLAG) -D$(DEFINES:;= -D) $(WARNINGS)
|
||||
# The output directory for all the temporary muck
|
||||
TMP_D=tmp
|
||||
|
||||
@@ -21,7 +21,7 @@ INCL=inc;inc/mingw;../openssl/include;../expat/lib;../neon/src
|
||||
O_LIBS3=$(LIB_PATH)\libs3.lib
|
||||
|
||||
INC=-I$(INCL:;= -I)
|
||||
LIB_CFLAGS=$(INC) $(CFLAG) $(LIB_CFLAG)
|
||||
LIB_CFLAGS=$(CFLAG) $(INC)
|
||||
|
||||
#############################################
|
||||
LIBS3_OBJS=\
|
||||
@@ -41,7 +41,7 @@ LIBS3_OBJS=\
|
||||
$(OBJ_D)\util.obj
|
||||
|
||||
.c.obj:
|
||||
$(CC) $(LIB_CFLAGS) -n$(@D) {$< }
|
||||
$(CC) $(LIB_CFLAGS) -o $@ $<
|
||||
|
||||
$(O_LIBS3): $(LIBS3_OBJS)
|
||||
if exist $(O_LIBS3) del $(O_LIBS3)
|
||||
|
||||
@@ -69,7 +69,7 @@ GOAL=$(MODEL)afxc$(BASE)$(DEBUGSUF)
|
||||
# COMPILER OPTIONS
|
||||
#
|
||||
# -VF4 Support MFC 4.0
|
||||
CL_OPT=-VF4 -n$(D) -w-
|
||||
CL_OPT=-VF4 -w-
|
||||
|
||||
DEFS=_declspec=__declspec;_WCHAR_T_DEFINED;__MSC;_ANONYMOUS_STRUCT;_MSC_VER=1200;_WINDOWS
|
||||
DEFS=$(DEFS)$(DEBDEFS);$(TARGDEFS)
|
||||
@@ -114,7 +114,7 @@ BORFLAGS=$(CPPFLAGS) -I$(INCL:;= -I)
|
||||
.path.obj = $(D)
|
||||
|
||||
.cpp.obj:
|
||||
$(CC) $(BORFLAGS) { $< }
|
||||
$(CC) $(BORFLAGS) -o $@ $<
|
||||
|
||||
#############################################################################
|
||||
# Goals to build
|
||||
|
||||
@@ -6,7 +6,7 @@ EXPAT_DEFINES=COMPILED_FROM_DSP;XML_STATIC
|
||||
DEFINES=WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;WIN32;NDEBUG;_LIB;_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL;NE_HAVE_SSL;HAVE_OPENSSL;HAVE_EXPAT;HAVE_EXPAT_H;NE_HAVE_DAV;NE_LFS;NOUSER;NOGDI;HAVE_STRTOLL;WINSCP
|
||||
ALLDEFINES=$(OPENSSL_DEFINES);$(EXPAT_DEFINES);$(DEFINES)
|
||||
WARNINGS=-w-ccc -w-rch -w-pia -w-aus -w-par -w-inl -w-eff -w-sus -w-dup -w-spa -w-csu -w-rvl -w-8065 -w-8069
|
||||
CFLAG=$(WARNINGS) $(CFLAG_COMMON)
|
||||
CFLAG=$(CFLAG_COMMON) $(WARNINGS)
|
||||
|
||||
# neon directory
|
||||
SRC_D=.
|
||||
@@ -29,7 +29,7 @@ O_NEON=$(OUT_D)\neon.lib
|
||||
######################################################
|
||||
|
||||
INC=-I$(INCL:;= -I)
|
||||
LIB_CFLAGS=$(INC) $(CFLAG) -D$(ALLDEFINES:;= -D)
|
||||
LIB_CFLAGS=$(CFLAG) $(INC) -D$(ALLDEFINES:;= -D)
|
||||
LIBS_DEP=$(O_NEON)
|
||||
|
||||
#############################################
|
||||
@@ -64,7 +64,7 @@ OBJFILES=\
|
||||
|
||||
.path.c = $(SRC_D)/src
|
||||
.c.obj:
|
||||
$(CC) $(LIB_CFLAGS) -n$(@D) {$< }
|
||||
$(CC) $(LIB_CFLAGS) -o $@ $<
|
||||
|
||||
$(O_NEON): $(OBJFILES)
|
||||
if exist $(O_NEON) del $(O_NEON)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user