diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2008-10-29 15:49:24 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2008-10-29 15:49:24 -0230 |
| commit | 34ba83f1bb769cc8e9b71b558efb1ac4d0e8dad4 (patch) | |
| tree | ee1afd827e9b88520e884552005ab27a08dfe080 /cpp | |
| parent | Bug 3133 - add --java2 option to allTests (diff) | |
| download | ice-34ba83f1bb769cc8e9b71b558efb1ac4d0e8dad4.tar.bz2 ice-34ba83f1bb769cc8e9b71b558efb1ac4d0e8dad4.tar.xz ice-34ba83f1bb769cc8e9b71b558efb1ac4d0e8dad4.zip | |
Bug 3380 - windows release build broken
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/IceBox/Makefile.mak | 6 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Makefile.mak | 9 |
2 files changed, 3 insertions, 12 deletions
diff --git a/cpp/src/IceBox/Makefile.mak b/cpp/src/IceBox/Makefile.mak index bfb33891aac..8b2262b8405 100644 --- a/cpp/src/IceBox/Makefile.mak +++ b/cpp/src/IceBox/Makefile.mak @@ -15,11 +15,7 @@ DLLNAME = $(top_srcdir)\bin\icebox$(SOVERSION)$(LIBSUFFIX).dll SERVER_D = $(top_srcdir)\bin\iceboxd.exe
SERVER_R = $(top_srcdir)\bin\icebox.exe
-!if "$(OPTIMIZE)" != "yes"
-SERVER = $(SERVER_D)
-!else
-SERVER = $(SERVER_R)
-!endif
+SERVER = $(top_srcdir)\bin\icebox$(LIBSUFFIX).exe
ADMIN = $(top_srcdir)\bin\iceboxadmin.exe
diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak index 5d6680b0249..87136b69d4f 100644 --- a/cpp/src/IceStorm/Makefile.mak +++ b/cpp/src/IceStorm/Makefile.mak @@ -18,13 +18,8 @@ SVCDLLNAME_D = $(top_srcdir)\bin\icestormservice$(SOVERSION)d.dll SVCLIBNAME_R = $(top_srcdir)\lib\icestormservice.lib
SVCDLLNAME_R = $(top_srcdir)\bin\icestormservice$(SOVERSION).dll
-!if "$(OPTIMIZE)" != "yes"
-SVCLIBNAME = $(SVCLIBNAME_D)
-SVCDLLNAME = $(SVCDLLNAME_D)
-!else
-SVCLIBNAME = $(SVCLIBNAME_R)
-SVCDLLNAME = $(SVCDLLNAME_R)
-!endif
+SVCLIBNAME = $(top_srcdir)\lib\icestormservice$(LIBSUFFIX).lib
+SVCDLLNAME = $(top_srcdir)\bin\icestormservice$(SOVERSION)$(LIBSUFFIX).dll
ADMIN = $(top_srcdir)\bin\icestormadmin.exe
MIGRATE = $(top_srcdir)\bin\icestormmigrate.exe
|