diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-11-16 15:50:14 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-11-16 15:50:14 -0500 |
| commit | 9cc300005952726e1bda5feb9bc047cf143e39a0 (patch) | |
| tree | 88795bd365347d2542a84e66087888d64e6e72cd /cpp/src | |
| parent | Updated depend files (diff) | |
| download | ice-9cc300005952726e1bda5feb9bc047cf143e39a0.tar.bz2 ice-9cc300005952726e1bda5feb9bc047cf143e39a0.tar.xz ice-9cc300005952726e1bda5feb9bc047cf143e39a0.zip | |
Fixed Freeze/Windows build
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Freeze/Makefile.mak | 12 | ||||
| -rw-r--r-- | cpp/src/slice2freeze/Main.cpp | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak index beb7d6a66ea..d140f82c227 100644 --- a/cpp/src/Freeze/Makefile.mak +++ b/cpp/src/Freeze/Makefile.mak @@ -20,6 +20,7 @@ OBJS = BackgroundSaveEvictor.obj \ BackgroundSaveEvictorI.obj \ CatalogData.obj \ Catalog.obj \ + CatalogIndexList.obj \ ConnectionI.obj \ Connection.obj \ DB.obj \ @@ -72,10 +73,19 @@ $(HDIR)/Catalog.h Catalog.cpp: $(SLICE2FREEZE) $(SDIR)/CatalogData.ice $(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::Catalog,string,Freeze::CatalogData \ Catalog $(slicedir)/Freeze/CatalogData.ice move Catalog.h $(HDIR) - clean:: del /q $(HDIR)\Catalog.h Catalog.cpp + +$(HDIR)/CatalogIndexList.h CatalogIndexList.cpp: $(SLICE2FREEZE) $(slicedir)/Ice/BuiltinSequences.ice + del /q $(HDIR)\CatalogIndexList.h CatalogIndexList.cpp + $(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::CatalogIndexList,string,Ice::StringSeq \ + CatalogIndexList $(slicedir)/Ice/BuiltinSequences.ice + move CatalogIndexList.h $(HDIR) + +clean:: + del /q $(HDIR)\CatalogIndexList.h CatalogIndexList.cpp + clean:: del /q $(DLLNAME:.dll=.*) del /q DB.cpp $(HDIR)\DB.h diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp index c9801112aeb..bde11696975 100644 --- a/cpp/src/slice2freeze/Main.cpp +++ b/cpp/src/slice2freeze/Main.cpp @@ -668,7 +668,7 @@ writeDictWithIndicesC(const string& name, const string& absolute, const Dict& di // Recreate // C << sp << nl << "void" - << nl << absolute << "::" << name + << nl << absolute << "::recreate(const Freeze::ConnectionPtr& __connection, const std::string& __dbName ," << " const " << compare << "& __compare)"; C << sb; |