Updated to match the new config.sh file used on Windows, so that it can work with MSC (already the case) but also with MinGW on a multiprocessor architecture.
git-svn-id: https://svn.origo.ethz.ch/eiffelstudio/trunk/Src/library/cURL@83539 8089f293-4706-0410-a29e-feb5c42a2edf
This commit is contained in:
+7
-16
@@ -12,7 +12,8 @@ JILCFLAGS = $(CFLAGS) $mtccflags $optimize -DEIF_IL_DLL
|
|||||||
LN = copy
|
LN = copy
|
||||||
MV = $mv
|
MV = $mv
|
||||||
RM = $del
|
RM = $del
|
||||||
MKDIR_TARGET = $mkdir_target
|
MAKE = $make
|
||||||
|
MKDIR = $mkdir
|
||||||
LINK = $link32
|
LINK = $link32
|
||||||
DLL_FLAGS = $dll_flags
|
DLL_FLAGS = $dll_flags
|
||||||
DLL_LIBS = $dll_libs
|
DLL_LIBS = $dll_libs
|
||||||
@@ -23,39 +24,29 @@ IL_OBJECTS = ILeiffel_curl.$obj
|
|||||||
.c.$obj:
|
.c.$obj:
|
||||||
$(CC) -c $(JCFLAGS) $<
|
$(CC) -c $(JCFLAGS) $<
|
||||||
|
|
||||||
all:: lib_dir $output_libraries clean
|
all:: $output_libraries
|
||||||
|
$(MAKE) clean
|
||||||
|
|
||||||
standard:: eiffel_curl.lib ileiffel_curl.lib
|
standard:: eiffel_curl.lib ileiffel_curl.lib
|
||||||
mtstandard:: mteiffel_curl.lib
|
mtstandard:: mteiffel_curl.lib
|
||||||
|
|
||||||
..$(DIR)spec:
|
|
||||||
$(MKDIR_TARGET)
|
|
||||||
|
|
||||||
..$(DIR)spec$(DIR)$(ISE_C_COMPILER): ..$(DIR)spec
|
|
||||||
$(MKDIR_TARGET)
|
|
||||||
|
|
||||||
..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM): ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)
|
|
||||||
$(MKDIR_TARGET)
|
|
||||||
|
|
||||||
..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib: ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)
|
|
||||||
$(MKDIR_TARGET)
|
|
||||||
|
|
||||||
lib_dir: ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(RM) *.$obj
|
$(RM) *.$obj
|
||||||
$(RM) *.lib
|
$(RM) *.lib
|
||||||
|
|
||||||
eiffel_curl.lib: $(OBJECTS)
|
eiffel_curl.lib: $(OBJECTS)
|
||||||
$alib_line
|
$alib_line
|
||||||
|
$(MKDIR) ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib
|
||||||
$(MV) $@ ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib$(DIR)$@
|
$(MV) $@ ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib$(DIR)$@
|
||||||
|
|
||||||
mteiffel_curl.lib: $(MT_OBJECTS)
|
mteiffel_curl.lib: $(MT_OBJECTS)
|
||||||
$alib_line
|
$alib_line
|
||||||
|
$(MKDIR) ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib
|
||||||
$(MV) $@ ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib$(DIR)$@
|
$(MV) $@ ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib$(DIR)$@
|
||||||
|
|
||||||
ileiffel_curl.lib: $(IL_OBJECTS)
|
ileiffel_curl.lib: $(IL_OBJECTS)
|
||||||
$alib_line
|
$alib_line
|
||||||
|
$(MKDIR) ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib
|
||||||
$(MV) $@ ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib$(DIR)$@
|
$(MV) $@ ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib$(DIR)$@
|
||||||
|
|
||||||
#Multithreaded targets.
|
#Multithreaded targets.
|
||||||
|
|||||||
Reference in New Issue
Block a user