diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2008-06-04 16:35:31 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2008-06-04 16:35:31 -0230 |
| commit | 56bc4d785ee89607f97073e4a96d9afee7145cfa (patch) | |
| tree | 78fcd62f8a2f189f0bb0866232756e51fb1dc317 /cppe/test | |
| parent | Bug 2196 - IceE tests should use client lib where possible (diff) | |
| download | ice-56bc4d785ee89607f97073e4a96d9afee7145cfa.tar.bz2 ice-56bc4d785ee89607f97073e4a96d9afee7145cfa.tar.xz ice-56bc4d785ee89607f97073e4a96d9afee7145cfa.zip | |
Minor mod to IceE Makefile.mak
Diffstat (limited to 'cppe/test')
| -rw-r--r-- | cppe/test/Common/Makefile.mak | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cppe/test/Common/Makefile.mak b/cppe/test/Common/Makefile.mak index 3619c9f8692..b6d0bb672b4 100644 --- a/cppe/test/Common/Makefile.mak +++ b/cppe/test/Common/Makefile.mak @@ -26,10 +26,6 @@ CPPFLAGS = -I..\include $(CPPFLAGS) -DICE_TEST_COMMON_API_EXPORTS PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
!endif
-!if "$(EMBEDDED_DEVICE)" != ""
-LIBS = $(LIBS)
-!endif
-
!if "$(STATICLIBS)" == "yes"
$(DLLNAME):
@@ -42,7 +38,7 @@ $(LIBNAME): $(OBJS) $(LIBNAME): $(DLLNAME)
$(DLLNAME): $(OBJS)
- $(LINK) $(LDFLAGS) /dll $(PDBFLAGS) $(OBJS) /out:$(DLLNAME) $(LIBS)
+ $(LINK) $(LDFLAGS) /dll $(PDBFLAGS) $(OBJS) /out:$(DLLNAME) $(MINLIBS)
move $(DLLNAME:.dll=.lib) $(LIBNAME)
@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
|