Changeset 22062

Timestamp:

2010-05-07T14:57:58+12:00 (14 years ago)

Author:

ak19

Message:

Updating windows makefiles to mirror the same changes that Dr Bainbridge recently committed for Linux.

Location:

main/trunk/greenstone2

Files:

• common-src/src/lib/win32.mak (modified) (2 diffs)
• runtime-src/src/colservr/win32.mak (modified) (2 diffs)
• runtime-src/src/recpt/win32.mak (modified) (5 diffs)

main/trunk/greenstone2/common-src/src/lib/win32.mak

@@ -129 +129 @@
     OIDtools.cpp \
     phrases.cpp \
+    sqldbclass.cpp \
     text_t.cpp \
     unitool.cpp \
@@ -151 +152 @@
     OIDtools.obj \
     phrases.obj \
+    sqldbclass.obj \
     text_t.obj \
     unitool.obj \

main/trunk/greenstone2/runtime-src/src/colservr/win32.mak

@@ -188 +188 @@
     search.cpp \
     source.cpp \
-    sqlbrowsefilter.cpp
+    sqlbrowsefilter.cpp \
+    sqlfilter.cpp \
+    sqlqueryfilter.cpp
 
 OBJECTS = \
@@ -211 +213 @@
     search.obj \
     source.obj \
-    sqlbrowsefilter.obj
+    sqlbrowsefilter.obj \
+    sqlfilter.obj \
+    sqlqueryfilter.obj
 
 LIBRARY = gsdlcolservr.lib  

main/trunk/greenstone2/runtime-src/src/recpt/win32.mak

@@ -85 +85 @@
 
 !IF $(USE_SQLITE)
+SQLITE_DEFINES = -DUSE_SQLITE
+SQL_SOURCES = sqlqueryaction.cpp
+SQL_OBJECTS = sqlqueryaction.o
 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
 !ELSE
+SQLITE_DEFINES =
+SQL_SOURCES =
+SQL_OBJECTS =
 SQLITE_LIBS = 
 !ENDIF
@@ -169 +175 @@
     argdb.cpp \
     authenaction.cpp \
+    basequeryaction.cpp \
     browseaction.cpp \
     browseactiontools.cpp \
@@ -203 +210 @@
     receptionist.cpp \
     statusaction.cpp \
+    $(SQL_SOURCES) \
     summarise.cpp \
     tipaction.cpp \
@@ -214 +222 @@
     argdb.obj \
     authenaction.obj \
+    basequeryaction.obj \
     browseaction.obj \
     browseactiontools.obj \
@@ -248 +257 @@
     receptionist.obj \
     statusaction.obj \
+    $(SQL_OBJECTS) \
     summarise.obj \
     tipaction.obj \