Changeset 13773 for trunk/gsdl/src/recpt/win32.mak

Timestamp:

2007-01-24T10:44:49+13:00 (17 years ago)

Author:

kjdon

Message:

mg, mgpp, unac. lucenewrap moved from gsdl into separate indexers repository so they can be easily shared with gs3.

File:

• trunk/gsdl/src/recpt/win32.mak (modified) (4 diffs)

trunk/gsdl/src/recpt/win32.mak

@@ -59 +59 @@
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE -DGSDL_NOCACHE
 INCLUDES = -I"$(GSDLHOME)\src\recpt" -I"$(GSDLHOME)\lib" -I"$(GSDLHOME)\src\colservr" \
-       -I"$(GSDLHOME)\packages\mg" -I"$(GSDLHOME)\packages\mg\lib" \
-       -I"$(GSDLHOME)\packages\mg\src\text" -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" \
-       -I"$(GSDLHOME)\packages\windows\crypt\crypt" -I"$(GSDLHOME)\src\mgpp\lib" \
-       -I"$(GSDLHOME)\src\mgpp\text" -I"$(GSDLHOME)"
+       -I"$(GSDLHOME)\indexers\mg" -I"$(GSDLHOME)\indexers\mg\lib" \
+       -I"$(GSDLHOME)\indexers\mg\src\text" -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" \
+       -I"$(GSDLHOME)\packages\windows\crypt\crypt" -I"$(GSDLHOME)\indexers\mgpp\lib" \
+       -I"$(GSDLHOME)\indexers\mgpp\text" -I"$(GSDLHOME)"
 !IF $(GSDL_VC4)
 DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
@@ -72 +72 @@
 
 !IF $(ENABLE_ACCENTFOLD)
-AFLIBS = "$(GSDLHOME)\packages\unac\libunac.lib" "$(GSDLHOME)\packages\unac\iconv.lib"
+AFLIBS = "$(GSDLHOME)\indexers\packages\unac\libunac.lib" "$(GSDLHOME)\indexers\packages\unac\iconv.lib"
 DEFS = $(DEFS) -DENABLE_ACCENTFOLD
 !ELSE
@@ -82 +82 @@
        "$(GSDLHOME)\src\colservr\gsdlcolservr.lib" \
        "$(GSDLHOME)\lib\gsdllib.lib" \
-       "$(GSDLHOME)\packages\mg\src\text\libtextin.lib" \
-       "$(GSDLHOME)\packages\mg\lib\libmg.lib" \
-       "$(GSDLHOME)\src\mgpp\text\libtextin.lib" \
-       "$(GSDLHOME)\src\mgpp\lib\libmg.lib" \
+       "$(GSDLHOME)\indexers\mg\src\text\libmgtext.lib" \
+       "$(GSDLHOME)\indexers\mg\lib\libmglib.lib" \
+       "$(GSDLHOME)\indexers\mgpp\text\libmgpptext.lib" \
+       "$(GSDLHOME)\indexers\mgpp\lib\libmgpplib.lib" \
        "$(GSDLHOME)\packages\windows\expat\expat\libexpat.lib" \
     $(AFLIBS)
@@ -206 +206 @@
     ../colservr/z3950server.o ../colservr/read-grs.o nullproto.o \
     ../../lib/gsdllib.a  \
-    ../../packages/mg/src/text/libtextin.a \
-    ../../packages/mg/lib/libmg.a \
+    ../../indexers/mg/src/text/libmgtext.a \
+    ../../indexers/mg/lib/libmglib.a \
     $(FASTCGI_OBJS) \
-    ../mgpp/text/libtextin.a \
-    ../mgpp/lib/libmg.a ../../packages/yaz/lib/libyaz.a ../../packages/d2m/libd2m.a
+    ../../indexers/mgpp/text/libmgpptext.a \
+    ../../indexers/mgpp/lib/libmgpplib.a ../../packages/yaz/lib/libyaz.a ../../packages/d2m/libd2m.a
 
 Z3950_OBJS =  "$(GSDLHOME)\src\colservr\gsdlz3950.lib" \