projects
/
asdcplib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
70ddd1b
)
Add Expat.
author
msheby
<msheby@cinecert.com>
Fri, 22 Aug 2008 00:43:27 +0000
(
00:43
+0000)
committer
msheby
<>
Fri, 22 Aug 2008 00:43:27 +0000
(
00:43
+0000)
win32/Makefile.mak
patch
|
blob
|
history
diff --git
a/win32/Makefile.mak
b/win32/Makefile.mak
index 339e395b783b31a8498f126e99a25f05adc68922..f0fa7d635df591f9e14eb62ef359140d11aabef7 100755
(executable)
--- a/
win32/Makefile.mak
+++ b/
win32/Makefile.mak
@@
-5,6
+5,7
@@
#
\r
#
\r
\r
#
\r
#
\r
\r
+
\r
ARCH = win32
\r
\r
SRCDIR=..\src
\r
ARCH = win32
\r
\r
SRCDIR=..\src
\r
@@
-41,12
+42,19
@@
LINKFLAGS = $(LINKFLAGS1)
\r
!IFDEF WITH_XERCES
\r
!ifdef WITH_XML_PARSER
\r
\r
!IFDEF WITH_XERCES
\r
!ifdef WITH_XML_PARSER
\r
-!ERROR "Cannot include both Expat and Xerces!"
\r
+!ERROR "Cannot include both Expat and Xerces
-C++
!"
\r
!endif
\r
\r
XERCES_DIR = $(WITH_XERCES)
\r
CPPFLAGS = $(CXXFLAGS2) /DHAVE_XERCES_C=1 /I"$(XERCES_DIR)"\include
\r
LIBFLAGS = $(LIBFLAGS1) /LIBPATH:"$(XERCES_DIR)"\lib
\r
!endif
\r
\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
+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
+!ELSE
\r
+LIBFLAGS = $(LIBFLAGS1) /LIBPATH:"$(WITH_XML_PARSER)"\Source\win32\bin\release
\r
+!ENDIF
\r
!ELSE
\r
CPPFLAGS = $(CXXFLAGS2)
\r
LIBFLAGS = $(LIBFLAGS1)
\r
!ELSE
\r
CPPFLAGS = $(CXXFLAGS2)
\r
LIBFLAGS = $(LIBFLAGS1)
\r
@@
-62,6
+70,8
@@
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
+ $(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
!ENDIF
\r
!ELSE
\r
$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $(KUMU_OBJS) libeay32.lib
\r
!ENDIF
\r