Changeset 21699
- Timestamp:
- 2010-02-02T14:32:23+13:00 (14 years ago)
- Location:
- main/trunk/gs2-core
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/gs2-core/common-src/src/lib/win32.mak
r21689 r21699 26 26 27 27 28 GSDL_DIR = $(GSDLHOME) 29 30 28 31 # Libraries compiled 29 32 LIBRARIES = gsdllib.lib … … 32 35 LIBGSDL_CPPFLAGS = 33 36 37 # Objects for gsdllib.lib 34 38 LIBGSDL_OBJECTS = \ 35 39 cfgread.obj \ … … 53 57 # Option: SQLite support 54 58 !IF $(USE_SQLITE) 55 LIBGSDL_CPPFLAGS = -DUSE_SQLITE $(LIBGSDL_CPPFLAGS) -I"$(GSDL HOME)\common-src\packages\sqlite\include"59 LIBGSDL_CPPFLAGS = -DUSE_SQLITE $(LIBGSDL_CPPFLAGS) -I"$(GSDL_DIR)\common-src\packages\sqlite\include" 56 60 LIBGSDL_OBJECTS = $(LIBGSDL_OBJECTS) sqlitedbclass.obj 57 61 !ENDIF -
main/trunk/gs2-core/runtime-src/src/colservr/win32.mak
r21692 r21699 26 26 27 27 28 GSDL_DIR = $(GSDLHOME) 29 30 28 31 # Libraries compiled 29 32 LIBRARIES = gsdlcolservr.lib … … 32 35 # Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist! 33 36 LIBCOLSERVR_CPPFLAGS = \ 34 -I $(GSDLHOME)\common-src\src\lib37 -I"$(GSDL_DIR)\common-src\src\lib" 35 38 36 39 LIBCOLSERVR_OBJECTS = \ … … 58 61 # Option: Lucene support 59 62 !IF $(ENABLE_LUCENE) 60 LIBCOLSERVR_CPPFLAGS = -DENABLE_LUCENE $(LIBCOLSERVR_CPPFLAGS) -I"$(GSDL HOME)\common-src\packages\windows\expat\expat"63 LIBCOLSERVR_CPPFLAGS = -DENABLE_LUCENE $(LIBCOLSERVR_CPPFLAGS) -I"$(GSDL_DIR)\common-src\packages\windows\expat\expat" 61 64 !ENDIF 62 65 63 66 # Option: SQLite support 64 67 !IF $(USE_SQLITE) 65 LIBCOLSERVR_CPPFLAGS = -DUSE_SQLITE $(LIBCOLSERVR_CPPFLAGS) -I"$(GSDL HOME)\common-src\packages\sqlite\include"68 LIBCOLSERVR_CPPFLAGS = -DUSE_SQLITE $(LIBCOLSERVR_CPPFLAGS) -I"$(GSDL_DIR)\common-src\packages\sqlite\include" 66 69 !ENDIF 67 70 68 71 69 72 COMPILE = cl -nologo -c -EHsc -D__WIN32__ -DXML_STATIC -D_CRT_SECURE_NO_DEPRECATE $(LIBCOLSERVR_CPPFLAGS) 70 LINK = cl -nologo -Fe"$@" 73 LINK = cl -nologo -Fe"$@" 71 74 72 75 .SUFFIXES: … … 77 80 78 81 79 gsdlcolservr.lib: $(LIBCOLSERVR_OBJECTS) 82 gsdlcolservr.lib: $(LIBCOLSERVR_OBJECTS) 80 83 if EXIST gsdlcolservr.lib del gsdlcolservr.lib 81 84 lib -nologo /out:gsdlcolservr.lib $(LIBCOLSERVR_OBJECTS) -
main/trunk/gs2-core/runtime-src/src/oaiservr/win32.mak
r21697 r21699 26 26 27 27 28 GSDL_DIR = $(GSDLHOME) 29 30 28 31 # Programs compiled and their install directories 29 CGIBIN_DIR = $(GSDLHOME)\cgi-bin32 CGIBIN_DIR = "$(GSDL_DIR)\cgi-bin" 30 33 CGIBIN_PROGRAMS = oaiserver.cgi 31 34 32 35 # Program: oaiserver.cgi 33 36 OAISERVER_CGI_CPPFLAGS = \ 34 -I $(GSDLHOME)\common-src\src\lib\35 -I $(GSDLHOME)\runtime-src\src\colservr\36 -I $(GSDLHOME)\runtime-src\src\protocol\37 -I $(GSDLHOME)\runtime-src\src\recpt37 -I"$(GSDL_DIR)\common-src\src\lib" \ 38 -I"$(GSDL_DIR)\runtime-src\src\colservr" \ 39 -I"$(GSDL_DIR)\runtime-src\src\protocol" \ 40 -I"$(GSDL_DIR)\runtime-src\src\recpt" 38 41 39 42 # Objects for oaiserver.cgi … … 57 60 resumptiontoken.obj \ 58 61 rfc1807.obj \ 59 $(GSDLHOME)\runtime-src\src\recpt\cgiargs.obj\60 $(GSDLHOME)\runtime-src\src\recpt\cgiutils.obj\61 $(GSDLHOME)\runtime-src\src\recpt\htmlutils.obj62 "$(GSDL_DIR)\runtime-src\src\recpt\cgiargs.obj" \ 63 "$(GSDL_DIR)\runtime-src\src\recpt\cgiutils.obj" \ 64 "$(GSDL_DIR)\runtime-src\src\recpt\htmlutils.obj" 62 65 63 66 OAISERVER_CGI_LDADD = \ 64 $(GSDLHOME)\runtime-src\src\protocol\gsdlprotocol.lib\65 $(GSDLHOME)\runtime-src\src\colservr\gsdlcolservr.lib\66 $(GSDLHOME)\common-src\src\lib\gsdllib.lib67 "$(GSDL_DIR)\runtime-src\src\protocol\gsdlprotocol.lib" \ 68 "$(GSDL_DIR)\runtime-src\src\colservr\gsdlcolservr.lib" \ 69 "$(GSDL_DIR)\common-src\src\lib\gsdllib.lib" 67 70 68 71 69 72 # Option: SQLite support 70 73 !IF $(USE_SQLITE) 71 OAISERVER_CGI_LDADD = $(OAISERVER_CGI_LDADD) $(GSDLHOME)\common-src\packages\sqlite\lib\sqlite3.lib74 OAISERVER_CGI_LDADD = $(OAISERVER_CGI_LDADD) "$(GSDL_DIR)\common-src\packages\sqlite\lib\sqlite3.lib" 72 75 !ENDIF 73 76 74 77 75 78 COMPILE = cl -nologo -c -EHsc -D__WIN32__ -DXML_STATIC -D_CRT_SECURE_NO_DEPRECATE $(OAISERVER_CGI_CPPFLAGS) 76 LINK = cl -nologo -Fe"$@" 79 LINK = cl -nologo -Fe"$@" 77 80 78 81 .SUFFIXES: -
main/trunk/gs2-core/runtime-src/src/protocol/win32.mak
r21693 r21699 26 26 27 27 28 GSDL_DIR = $(GSDLHOME) 29 30 28 31 # Libraries compiled 29 32 LIBRARIES = gsdlprotocol.lib … … 32 35 # Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist! 33 36 LIBPROTOCOL_CPPFLAGS = \ 34 -I $(GSDLHOME)\common-src\src\lib\35 -I $(GSDLHOME)\runtime-src\src\colservr37 -I"$(GSDL_DIR)\common-src\src\lib" \ 38 -I"$(GSDL_DIR)\runtime-src\src\colservr" 36 39 37 40 LIBPROTOCOL_OBJECTS = \ -
main/trunk/gs2-core/runtime-src/src/recpt/win32.mak
r21695 r21699 26 26 27 27 28 GSDL_DIR = $(GSDLHOME) 29 30 28 31 # Programs compiled and their install directories 29 CGIBIN_DIR = $(GSDLHOME)\cgi-bin32 CGIBIN_DIR = "$(GSDL_DIR)\cgi-bin" 30 33 CGIBIN_PROGRAMS = library.cgi 31 34 32 35 # Program: library.cgi 33 36 LIBRARY_CGI_CPPFLAGS = \ 34 -I $(GSDLHOME)\common-src\src\lib\35 -I $(GSDLHOME)\runtime-src\src\colservr\36 -I $(GSDLHOME)\runtime-src\src\protocol\37 -I $(GSDLHOME)\common-src\packages\windows\crypt\crypt37 -I"$(GSDL_DIR)\common-src\src\lib" \ 38 -I"$(GSDL_DIR)\runtime-src\src\colservr" \ 39 -I"$(GSDL_DIR)\runtime-src\src\protocol" \ 40 -I"$(GSDL_DIR)\common-src\packages\windows\crypt\crypt" 38 41 39 42 # Objects for library.cgi … … 85 88 86 89 LIBRARY_CGI_LDADD = \ 87 $(GSDLHOME)\runtime-src\src\protocol\gsdlprotocol.lib\88 $(GSDLHOME)\runtime-src\src\colservr\gsdlcolservr.lib\89 $(GSDLHOME)\common-src\src\lib\gsdllib.lib\90 $(GSDLHOME)\common-src\packages\windows\crypt\crypt\crypt.lib90 "$(GSDL_DIR)\runtime-src\src\protocol\gsdlprotocol.lib" \ 91 "$(GSDL_DIR)\runtime-src\src\colservr\gsdlcolservr.lib" \ 92 "$(GSDL_DIR)\common-src\src\lib\gsdllib.lib" \ 93 "$(GSDL_DIR)\common-src\packages\windows\crypt\crypt\crypt.lib" 91 94 92 95 93 96 # Option: SQLite support 94 97 !IF $(USE_SQLITE) 95 LIBRARY_CGI_LDADD = $(LIBRARY_CGI_LDADD) $(GSDLHOME)\common-src\packages\sqlite\lib\sqlite3.lib98 LIBRARY_CGI_LDADD = $(LIBRARY_CGI_LDADD) "$(GSDL_DIR)\common-src\packages\sqlite\lib\sqlite3.lib" 96 99 !ENDIF 97 100
Note:
See TracChangeset
for help on using the changeset viewer.