Changeset 21325
- Timestamp:
- 2009-12-09T21:42:36+13:00 (14 years ago)
- Location:
- main/trunk/greenstone2/common-src/src
- Files:
-
- 3 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/common-src/src/gdbmedit/db2txt/win32.mak
r19882 r21325 50 50 51 51 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_CRT_SECURE_NO_DEPRECATE 52 INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\db2txt" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\indexers\mg\lib"\52 INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\db2txt" -I"$(COMMON_DIR)\src\lib" \ 53 53 -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3" -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3\windows" 54 54 !IF $(GSDL_VC4) … … 57 57 !ENDIF 58 58 59 LIBS = "$(COMMON_DIR)\ indexers\mg\lib\unitool.obj" "$(COMMON_DIR)\src\lib\gsdllib.lib" \59 LIBS = "$(COMMON_DIR)\src\lib\gsdllib.lib" \ 60 60 "$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3\gdbm.lib" 61 61 -
main/trunk/greenstone2/common-src/src/gdbmedit/gdbmdel/win32.mak
r19882 r21325 51 51 52 52 DEFS = -D__WIN32__ -DHAVE_CONFIG_H 53 INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\gdbmdel" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\indexers\mg\lib"\53 INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\gdbmdel" -I"$(COMMON_DIR)\src\lib" \ 54 54 -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3" -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3\windows" 55 55 !IF $(USE_STLPORT) -
main/trunk/greenstone2/common-src/src/gdbmedit/gdbmget/win32.mak
r19882 r21325 51 51 52 52 DEFS = -D__WIN32__ -DHAVE_CONFIG_H 53 INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\gdbmget" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\indexers\mg\lib"\53 INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\gdbmget" -I"$(COMMON_DIR)\src\lib" \ 54 54 -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3" -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3\windows" 55 55 !IF $(USE_STLPORT) -
main/trunk/greenstone2/common-src/src/gdbmedit/gdbmkeys/win32.mak
r19882 r21325 51 51 52 52 DEFS = -D__WIN32__ -DHAVE_CONFIG_H 53 INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\gdbmkeys" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\indexers\mg\lib"\53 INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\gdbmkeys" -I"$(COMMON_DIR)\src\lib" \ 54 54 -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3" -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3\windows" 55 55 !IF $(USE_STLPORT) -
main/trunk/greenstone2/common-src/src/gdbmedit/gdbmset/win32.mak
r19882 r21325 51 51 52 52 DEFS = -D__WIN32__ -DHAVE_CONFIG_H 53 INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\gdbmset" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\indexers\mg\lib"\53 INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\gdbmset" -I"$(COMMON_DIR)\src\lib" \ 54 54 -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3" -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3\windows" 55 55 !IF $(USE_STLPORT) -
main/trunk/greenstone2/common-src/src/gdbmedit/txt2db/Makefile.in
r18224 r21325 58 58 59 59 GSDL_LIBS = \ 60 $(COMMON_DIR)/src/lib/gsdllib.a \ 61 $(COMMON_DIR)/indexers/mg/lib/libmglib.a 60 $(COMMON_DIR)/src/lib/gsdllib.a 62 61 63 62 EXECUTABLE_OBJECTS = \ -
main/trunk/greenstone2/common-src/src/gdbmedit/txt2db/win32.mak
r19882 r21325 50 50 51 51 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_CRT_SECURE_NO_DEPRECATE 52 INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\txt2db" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\indexers\mg\lib"\52 INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\txt2db" -I"$(COMMON_DIR)\src\lib" \ 53 53 -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3" -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3\windows" 54 54 !IF $(GSDL_VC4) … … 57 57 !ENDIF 58 58 59 LIBS = "$(COMMON_DIR)\ indexers\mg\lib\unitool.obj" "$(COMMON_DIR)\src\lib\gsdllib.lib" \59 LIBS = "$(COMMON_DIR)\src\lib\gsdllib.lib" \ 60 60 "$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3\gdbm.lib" 61 61 -
main/trunk/greenstone2/common-src/src/lib/Makefile.in
r19966 r21325 48 48 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ 49 49 DEFS = @DEFS@ 50 INCLUDES = -I. -I$(COMMON_DIR) -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(INDEXERS_DIR)/mg/lib$(SQLITE_INCLUDES)50 INCLUDES = -I. -I$(COMMON_DIR) -I$(COMMON_PACKAGES_DIR)/gdbm/include $(SQLITE_INCLUDES) 51 51 RANLIB = @RANLIB@ 52 52 … … 78 78 phrases.cpp \ 79 79 text_t.cpp \ 80 unitool.cpp \ 80 81 $(SQLITE_SOURCES) 81 82 … … 97 98 phrases.o \ 98 99 text_t.o \ 100 unitool.o \ 99 101 $(SQLITE_OBJECTS) 100 102 -
main/trunk/greenstone2/common-src/src/lib/gsdlunicode.cpp
r8727 r21325 29 29 // unitool is currently in mg, if mg is not being used it should 30 30 // be moved into GSDLHOME/lib 31 // A copy of mgpp's unitool has now been moved into common-src/src/lib/ 31 32 #include "unitool.h" 32 33 -
main/trunk/greenstone2/common-src/src/lib/win32.mak
r19875 r21325 68 68 !ENDIF 69 69 70 !IF $(USE_SQLITE) 70 !IF "$(USE_SQLITE)" == "0" 71 SQLITE_INCLUDES = 72 SQLITE_OBJECTS = 73 SQLITE_SOURCES = 74 !ELSE 71 75 SQLITE_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\sqlite\include" 72 76 SQLITE_OBJECTS = sqlitedbclass.obj 73 77 SQLITE_SOURCES = sqlitedbclass.cpp 74 !ELSE75 SQLITE_INCLUDES =76 SQLITE_OBJECTS =77 SQLITE_SOURCES =78 78 !ENDIF 79 79 … … 82 82 CC = cl 83 83 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 84 INCLUDES = -I"$(COMMON_DIR)" -I"$(INDEXERS_DIR)\mg\lib"\84 INCLUDES = -I"$(COMMON_DIR)" \ 85 85 -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \ 86 86 $(SQLITE_INCLUDES) … … 121 121 phrases.cpp \ 122 122 text_t.cpp \ 123 unitool.cpp \ 123 124 $(SQLITE_SOURCES) \ 124 125 $(MSSQL_SOURCES) … … 141 142 phrases.obj \ 142 143 text_t.obj \ 144 unitool.obj \ 143 145 $(SQLITE_OBJECTS) \ 144 146 $(MSSQL_OBJECTS)
Note:
See TracChangeset
for help on using the changeset viewer.