summaryrefslogtreecommitdiffstats
path: root/src/windows/gina
diff options
context:
space:
mode:
authorDanilo Almeida <dalmeida@mit.edu>1999-12-04 01:50:44 +0000
committerDanilo Almeida <dalmeida@mit.edu>1999-12-04 01:50:44 +0000
commit780f69ec5044e8862041cfd94180922166b5460f (patch)
treed1477b584c1c232cb46d71e2e26c9538380da49b /src/windows/gina
parent2bd37be8b04977f8fc9bbdefffc1f2ebe89db1f7 (diff)
downloadkrb5-780f69ec5044e8862041cfd94180922166b5460f.tar.gz
krb5-780f69ec5044e8862041cfd94180922166b5460f.tar.xz
krb5-780f69ec5044e8862041cfd94180922166b5460f.zip
Pull src/windows changes from krb5-1-1 branch
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11936 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows/gina')
-rw-r--r--src/windows/gina/ChangeLog4
-rw-r--r--src/windows/gina/Makefile.in7
2 files changed, 8 insertions, 3 deletions
diff --git a/src/windows/gina/ChangeLog b/src/windows/gina/ChangeLog
index 7ddbd838e..d2e378bbf 100644
--- a/src/windows/gina/ChangeLog
+++ b/src/windows/gina/ChangeLog
@@ -1,3 +1,7 @@
+1999-12-03 Danilo Almeida <dalmeida@mit.edu>
+
+ * Makefile.in: Windows fix for updated win-pre.in.
+
Mon May 17 14:24:25 1999 Danilo Almeida <dalmeida@mit.edu>
* Makefile.in: Reflect that we only build this under win32.
diff --git a/src/windows/gina/Makefile.in b/src/windows/gina/Makefile.in
index 5cd317376..6cdda3d8a 100644
--- a/src/windows/gina/Makefile.in
+++ b/src/windows/gina/Makefile.in
@@ -4,7 +4,7 @@ OBJS= $(OUTPRE)ginastub.$(OBJEXT)
# Set NODEBUG if building release instead of debug
-INCLUDES = -I$(BUILDTOP)\include
+LOCALINCLUDES = -I$(BUILDTOP)\include
WINLIBS = advapi32.lib comctl32.lib \
libc.lib kernel32.lib wsock32.lib user32.lib shell32.lib oldnames.lib
@@ -12,10 +12,11 @@ WINLIBS = advapi32.lib comctl32.lib \
WINDLLFLAGS = /nodefaultlib /incremental:no /release \
/nologo /base:0x1c000000 /dll $(LOPTS)
+DEFINES = -DUNICODE -D_UNICODE
!ifdef NODEBUG
-CFLAGS = $(CCOPTS2) $(INCLUDES) -DUNICODE -D_UNICODE
+DEFINES = $(DEFINES)
!else
-CFLAGS = $(CCOPTS2) $(INCLUDES) -DUNICODE -D_UNICODE -DDBG
+DEFINES = $(DEFINES) -DDBG
!endif
all-windows::