Mercurial Mercurial > hg > stx-goodies-builder / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed ole for linux
authorsr
Fri, 13 Oct 2017 16:34:04 +0200
changeset 488 77e63fa48580
parent 487 63f2962fdb2f
child 489 095fe50a4e26
removed ole for linux
quickSelfTest/bc.mak file | annotate | diff | comparison | revisions 
--- a/quickSelfTest/bc.mak	Fri Oct 13 16:34:00 2017 +0200
+++ b/quickSelfTest/bc.mak	Fri Oct 13 16:34:04 2017 +0200
@@ -58,7 +58,7 @@
 LIBNAME=libstx_goodies_builder_quickSelfTest
 MODULE_PATH=goodies\builder\quickSelfTest
 STCOPT="+optinline"
-LOCALINCLUDES= -I$(INCLUDE_TOP)\exept\libcrypt -I$(INCLUDE_TOP)\exept\ole -I$(INCLUDE_TOP)\stx\goodies\regression -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\goodies\webServer\htmlTree -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libcomp
+LOCALINCLUDES= -I$(INCLUDE_TOP)\exept\libcrypt -I$(INCLUDE_TOP)\stx\goodies\regression -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\goodies\webServer\htmlTree -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libcomp
 LOCALDEFINES=
 GLOBALDEFINES=
 
@@ -83,9 +83,9 @@
 
 REQUIRED_LIBS=librun.dll  \
  libstx_libbasic.dll \
- libstx_goodies_webServer_htmlTree.dll \
  libstx_libbasic2.dll \
  libstx_libcomp.dll \
+ libstx_goodies_authentication.dll \
  libstx_goodies_refactoryBrowser_parser.dll \
  libstx_libbasic3.dll \
  libstx_libview.dll \
@@ -96,7 +96,6 @@
  libstx_libview2.dll \
  libstx_goodies_sunit.dll \
  libstx_libwidg.dll \
- libexept_ole.dll \
  libstx_libhtml.dll \
  libstx_libwidg2.dll \
  libstx_libcompat.dll \
@@ -105,11 +104,15 @@
  libstx_libjavascript.dll \
  libstx_goodies_xml_stx.dll \
  libstx_goodies_regression.dll \
+ libstx_goodies_webServer.dll \
+ libstx_goodies_webServer_htmlTree.dll \
 
 
 REQUIRED_FILES=$(RT_DLL) $(X11_DLL) $(XEXT_DLL) symbols.stc $(REQUIRED_LIBS)
 
-SUBPROJECT_LIBS=
+SUBPROJECT_LIBS= $(TOP)\..\exept\ole\$(OBJDIR)\libexept_ole.dll \
+ $(TOP)\..\exept\ole\QCOTA\$(OBJDIR)\libexept_ole_QCOTA.dll \
+
 
 
 REQUIRED_SUPPORT_DIRS=RESOURCEFILES
@@ -268,12 +271,6 @@
 ..\..\..\libbasic\$(OBJDIR)\libstx_libbasic.dll: $(FORCE)
 	pushd ..\..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
-libstx_goodies_webServer_htmlTree.dll: ..\..\webServer\htmlTree\$(OBJDIR)\libstx_goodies_webServer_htmlTree.dll
-	copy ..\..\webServer\htmlTree\$(OBJDIR)\libstx_goodies_webServer_htmlTree.dll *.*
-
-..\..\webServer\htmlTree\$(OBJDIR)\libstx_goodies_webServer_htmlTree.dll: $(FORCE)
-	pushd ..\..\webServer\htmlTree & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
 libstx_libbasic2.dll: ..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll
 	copy ..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll *.*
 
@@ -286,6 +283,12 @@
 ..\..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll: $(FORCE)
 	pushd ..\..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
+libstx_goodies_authentication.dll: ..\..\authentication\$(OBJDIR)\libstx_goodies_authentication.dll
+	copy ..\..\authentication\$(OBJDIR)\libstx_goodies_authentication.dll *.*
+
+..\..\authentication\$(OBJDIR)\libstx_goodies_authentication.dll: $(FORCE)
+	pushd ..\..\authentication & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
 libstx_goodies_refactoryBrowser_parser.dll: ..\..\refactoryBrowser\parser\$(OBJDIR)\libstx_goodies_refactoryBrowser_parser.dll
 	copy ..\..\refactoryBrowser\parser\$(OBJDIR)\libstx_goodies_refactoryBrowser_parser.dll *.*
 
@@ -346,12 +349,6 @@
 ..\..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll: $(FORCE)
 	pushd ..\..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
-libexept_ole.dll: ..\..\..\..\exept\ole\$(OBJDIR)\libexept_ole.dll
-	copy ..\..\..\..\exept\ole\$(OBJDIR)\libexept_ole.dll *.*
-
-..\..\..\..\exept\ole\$(OBJDIR)\libexept_ole.dll: $(FORCE)
-	pushd ..\..\..\..\exept\ole & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
 libstx_libhtml.dll: ..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll
 	copy ..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll *.*
 
@@ -400,7 +397,31 @@
 ..\..\regression\$(OBJDIR)\libstx_goodies_regression.dll: $(FORCE)
 	pushd ..\..\regression & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
+libstx_goodies_webServer.dll: ..\..\webServer\$(OBJDIR)\libstx_goodies_webServer.dll
+	copy ..\..\webServer\$(OBJDIR)\libstx_goodies_webServer.dll *.*
+
+..\..\webServer\$(OBJDIR)\libstx_goodies_webServer.dll: $(FORCE)
+	pushd ..\..\webServer & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_goodies_webServer_htmlTree.dll: ..\..\webServer\htmlTree\$(OBJDIR)\libstx_goodies_webServer_htmlTree.dll
+	copy ..\..\webServer\htmlTree\$(OBJDIR)\libstx_goodies_webServer_htmlTree.dll *.*
+
+..\..\webServer\htmlTree\$(OBJDIR)\libstx_goodies_webServer_htmlTree.dll: $(FORCE)
+	pushd ..\..\webServer\htmlTree & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
       
+libexept_ole.dll: ..\..\..\..\exept\ole\$(OBJDIR)\libexept_ole.dll
+	copy ..\..\..\..\exept\ole\$(OBJDIR)\libexept_ole.dll *.*
+
+..\..\..\..\exept\ole\$(OBJDIR)\libexept_ole.dll: $(FORCE)
+	pushd ..\..\..\..\exept\ole & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libexept_ole_QCOTA.dll: ..\..\..\..\exept\ole\QCOTA\$(OBJDIR)\libexept_ole_QCOTA.dll
+	copy ..\..\..\..\exept\ole\QCOTA\$(OBJDIR)\libexept_ole_QCOTA.dll *.*
+
+..\..\..\..\exept\ole\QCOTA\$(OBJDIR)\libexept_ole_QCOTA.dll: $(FORCE)
+	pushd ..\..\..\..\exept\ole\QCOTA & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
 
 
 show:
hg/stx-goodies-builder