--- a/stx_libbasic2.st Wed May 13 06:32:03 2015 +0100
+++ b/stx_libbasic2.st Wed May 13 06:22:44 2015 +0100
@@ -113,9 +113,26 @@
'
!
+additionalDefinitions_bc_dot_mak
+ "allows for additional definitions/rules to be added to the bc.mak file.
+ Subclasses may redefine this."
+
+ ^'
+!!ifdef USEBC
+WS2_32_LIB=ws2_32.lib
+!!else
+WS2_32_LIB=ws2_32.lib
+!!endif
+'
+
+ "Created: / 12-05-2015 / 19:01:29 / jv"
+!
+
additionalLinkLibraries_bc_dot_mak
"/ ^ '$(ZLIB) $(BZ2LIB)'
- ^ '$(ZLIB_DIR)\$(ZLIB) ws2_32.lib'
+ ^ '$(ZLIB_DIR)\$(ZLIB) $(WS2_32_LIB)'
+
+ "Modified: / 12-05-2015 / 19:00:25 / jv"
!
additionalLinkLibraries_make_dot_proto
@@ -125,15 +142,17 @@
additionalRules_bc_dot_mak
^ '
$(ZLIB):
- cd $(ZLIB_DIR)
- $(MAKE) $(MAKE_ZLIB_ARG) $(ZLIB)
- cd ..\..\libbasic2
+ cd $(ZLIB_DIR)
+ $(MAKE_BAT)
+ cd ..\..\libbasic2
$(BZ2LIB):
- cd $(BZ2LIB_DIR)
- $(MAKE) $(MAKE_BZ2LIB_ARG) bz2.lib
- cd ..\..\libbasic2
+ cd $(BZ2LIB_DIR)
+ $(MAKE) $(MAKE_BZ2LIB_ARG) bz2.lib
+ cd ..\..\libbasic2
'
+
+ "Modified: / 12-05-2015 / 18:53:34 / jv"
!
additionalRules_make_dot_proto
@@ -440,5 +459,9 @@
version_CVS
^ '$Header: /cvs/stx/stx/libbasic2/stx_libbasic2.st,v 1.120 2015-02-21 11:13:35 cg Exp $'
+!
+
+version_HG
+ ^ '$Changeset: <not expanded> $'
! !