projects
/
asdcplib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
607cda4
)
Allow command-line setting of OpenSSL location.
author
msheby
<msheby@cinecert.com>
Fri, 22 Aug 2008 18:04:31 +0000
(18:04 +0000)
committer
msheby
<>
Fri, 22 Aug 2008 18:04:31 +0000
(18:04 +0000)
win32/Makefile.mak
patch
|
blob
|
history
diff --git
a/win32/Makefile.mak
b/win32/Makefile.mak
index 6308cbb0319c0bad325925d4ac71d43232e5d866..70e37a47b8f95de5fc21063de87ac536beaf57e7 100755
(executable)
--- a/
win32/Makefile.mak
+++ b/
win32/Makefile.mak
@@
-16,7
+16,9
@@
ARCH = win32
\r
SRCDIR=..\src
\r
\r
\r
SRCDIR=..\src
\r
\r
-OPENSSL_DIR = ..\..\openssl
\r
+!ifndef WITH_OPENSSL
\r
+!error "OpenSSL is needed! Specify it with WITH_OPENSSL=<OpenSSL directory>"
\r
+!endif
\r
\r
KUMU_OBJS = KM_fileio.obj KM_log.obj KM_prng.obj KM_util.obj KM_xml.obj
\r
ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \
\r
\r
KUMU_OBJS = KM_fileio.obj KM_log.obj KM_prng.obj KM_util.obj KM_xml.obj
\r
ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \
\r
@@
-29,10
+31,10
@@
ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \
\r
CXXFLAGS1 = /nologo /W3 /GR /EHsc /DWIN32 /DKM_WIN32 /D_CONSOLE /I. /I$(SRCDIR) /DASDCP_PLATFORM=\"win32\" \
\r
/D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"1.3.19a\" \
\r
\r
CXXFLAGS1 = /nologo /W3 /GR /EHsc /DWIN32 /DKM_WIN32 /D_CONSOLE /I. /I$(SRCDIR) /DASDCP_PLATFORM=\"win32\" \
\r
/D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"1.3.19a\" \
\r
- /I$(
OPENSSL_DIR
)\inc32
\r
+ /I$(
WITH_OPENSSL
)\inc32
\r
\r
LIB_EXE = lib.exe
\r
\r
LIB_EXE = lib.exe
\r
-LIBFLAGS1 = /NOLOGO /LIBPATH:$(
OPENSSL_DIR
)\out32dll
\r
+LIBFLAGS1 = /NOLOGO /LIBPATH:$(
WITH_OPENSSL
)\out32dll
\r
\r
LINK = link.exe
\r
LINKFLAGS1 = /NOLOGO /SUBSYSTEM:console /MACHINE:I386 /LIBPATH:. /DEBUG
\r
\r
LINK = link.exe
\r
LINKFLAGS1 = /NOLOGO /SUBSYSTEM:console /MACHINE:I386 /LIBPATH:. /DEBUG
\r
@@
-46,6
+48,10
@@
CXXFLAGS2 = $(CXXFLAGS1) /MT /DNDEBUG /D_NDEBUG /O2
LINKFLAGS = $(LINKFLAGS1)
\r
!endif
\r
\r
LINKFLAGS = $(LINKFLAGS1)
\r
!endif
\r
\r
+!ifndef WITH_OPENSSL
\r
+!error "OpenSSL is needed!"
\r
+!endif
\r
+
\r
!IFDEF WITH_XERCES
\r
!ifdef WITH_XML_PARSER
\r
!ERROR "Cannot include both Expat and Xerces-C++!"
\r
!IFDEF WITH_XERCES
\r
!ifdef WITH_XML_PARSER
\r
!ERROR "Cannot include both Expat and Xerces-C++!"
\r
@@
-54,7
+60,7
@@
LINKFLAGS = $(LINKFLAGS1)
XERCES_DIR = $(WITH_XERCES)
\r
CPPFLAGS = $(CXXFLAGS2) /DHAVE_XERCES_C=1 /I"$(XERCES_DIR)"\include
\r
LIBFLAGS = $(LIBFLAGS1) /LIBPATH:"$(XERCES_DIR)"\lib
\r
XERCES_DIR = $(WITH_XERCES)
\r
CPPFLAGS = $(CXXFLAGS2) /DHAVE_XERCES_C=1 /I"$(XERCES_DIR)"\include
\r
LIBFLAGS = $(LIBFLAGS1) /LIBPATH:"$(XERCES_DIR)"\lib
\r
-!ELSEIF WITH_XML_PARSER
\r
+!ELSEIF
DEF
WITH_XML_PARSER
\r
CPPFLAGS = $(CXXFLAGS2) /DASDCP_USE_EXPAT /I"$(WITH_XML_PARSER)"\Source\lib
\r
!IFDEF DEBUG
\r
LIBFLAGS = $(LIBFLAGS1) /LIBPATH:"$(WITH_XML_PARSER)"\Source\win32\bin\debug
\r
CPPFLAGS = $(CXXFLAGS2) /DASDCP_USE_EXPAT /I"$(WITH_XML_PARSER)"\Source\lib
\r
!IFDEF DEBUG
\r
LIBFLAGS = $(LIBFLAGS1) /LIBPATH:"$(WITH_XML_PARSER)"\Source\win32\bin\debug
\r
@@
-76,7
+82,7
@@
libkumu.lib : $(KUMU_OBJS)
!ELSE
\r
$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $(KUMU_OBJS) libeay32.lib xerces-c_2.lib
\r
!ENDIF
\r
!ELSE
\r
$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $(KUMU_OBJS) libeay32.lib xerces-c_2.lib
\r
!ENDIF
\r
-!ELSEIF WITH_XML_PARSER
\r
+!ELSEIF
DEF
WITH_XML_PARSER
\r
$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $(KUMU_OBJS) libeay32.lib libexpatMT.lib
\r
!ELSE
\r
$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $(KUMU_OBJS) libeay32.lib
\r
$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $(KUMU_OBJS) libeay32.lib libexpatMT.lib
\r
!ELSE
\r
$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $(KUMU_OBJS) libeay32.lib
\r