projects
/
asdcplib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9f267e9
)
version update:
author
mikey
<mikey@cinecert.com>
Tue, 6 Mar 2012 21:49:45 +0000
(21:49 +0000)
committer
mikey
<>
Tue, 6 Mar 2012 21:49:45 +0000
(21:49 +0000)
win32/Makefile.mak
patch
|
blob
|
history
diff --git
a/win32/Makefile.mak
b/win32/Makefile.mak
index 2af0d52687aac8c0cfbbdb6e16fb3ec80acc1674..ecdc2a984c048439c554fb46a2adc131e911d971 100755
(executable)
--- a/
win32/Makefile.mak
+++ b/
win32/Makefile.mak
@@
-33,11
+33,11
@@
OBJDIR = .
\r
!ifdef ENABLE_RANDOM_UUID
\r
CXXFLAGS1 = /nologo /W3 /GR /EHsc /DWIN32 /DKM_WIN32 /D_CONSOLE /I. /I$(SRCDIR) /DASDCP_PLATFORM=\"win32\" \
\r
\r
!ifdef ENABLE_RANDOM_UUID
\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.
8.42
\" \
\r
+ /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"1.
9.45
\" \
\r
/I"$(WITH_OPENSSL)"\inc32 /DCONFIG_RANDOM_UUID=1
\r
!else
\r
CXXFLAGS1 = /nologo /W3 /GR /EHsc /DWIN32 /DKM_WIN32 /D_CONSOLE /I. /I$(SRCDIR) /DASDCP_PLATFORM=\"win32\" \
\r
/I"$(WITH_OPENSSL)"\inc32 /DCONFIG_RANDOM_UUID=1
\r
!else
\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.
8.42
\" \
\r
+ /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"1.
9.45
\" \
\r
/I"$(WITH_OPENSSL)"\inc32
\r
!endif
\r
LIB_EXE = lib.exe
\r
/I"$(WITH_OPENSSL)"\inc32
\r
!endif
\r
LIB_EXE = lib.exe
\r