diff options
| author | Jose <jose@zeroc.com> | 2016-03-09 11:12:31 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-03-09 11:12:31 +0100 |
| commit | 3f906025bfb9b0ee56f532f9ce14a36843a3188b (patch) | |
| tree | 7ac3e376834a08c9219d2c1b0e1ffb9c64adae75 /cpp/src/IceGrid | |
| parent | Fixed branch for Travis (diff) | |
| download | ice-3f906025bfb9b0ee56f532f9ce14a36843a3188b.tar.bz2 ice-3f906025bfb9b0ee56f532f9ce14a36843a3188b.tar.xz ice-3f906025bfb9b0ee56f532f9ce14a36843a3188b.zip | |
icegriddb Windows build fixes
Diffstat (limited to 'cpp/src/IceGrid')
| -rw-r--r-- | cpp/src/IceGrid/Makefile.mak | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak index 0d0caa02c6d..316fd0371c7 100644 --- a/cpp/src/IceGrid/Makefile.mak +++ b/cpp/src/IceGrid/Makefile.mak @@ -137,6 +137,7 @@ CPPFLAGS = -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -Zm200 !if "$(GENERATE_PDB)" == "yes" APDBFLAGS = /pdb:$(ADMIN:.exe=.pdb) +DBPDBFLAGS = /pdb:$(DB:.exe=.pdb) RPDBFLAGS = /pdb:$(REGISTRY_SERVER:.exe=.pdb) NPDBFLAGS = /pdb:$(NODE_SERVER:.exe=.pdb) !endif @@ -154,7 +155,7 @@ $(ADMIN): $(ADMIN_OBJS) IceGridAdmin.res signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@ $(DB): $(DB_OBJS) IceGridDB.res - $(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(DB_OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(DLINKWITH) $(DRES_FILE) + $(LINK) $(LD_EXEFLAGS) $(DBPDBFLAGS) $(DB_OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(DLINKWITH) $(DRES_FILE) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) &&\ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest @if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \ |