Fixing and separating BI and BM for GJ_LIB_NL

grymmjack · Feb 13, 2024 · 899ff66 · 899ff66
1 parent 8b4036e
commit 899ff66
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/DUMP/DUMP.BI b/DUMP/DUMP.BI
@@ -15,11 +15,7 @@ $IF GJ_LIB_DICT_INC_BI = UNDEFINED THEN
 '$INCLUDE:'../DICT/DICT.BI'
 $END IF
 
-$IF GJ_LIB_NL = UNDEFINED THEN
+$IF GJ_LIB_NL_BI = UNDEFINED THEN
+$LET GJ_LIB_NL_BI = 1
     DIM SHARED GJ_LIB_NL AS STRING
 $END IF
-$IF GJ_LIB_NL = UNDEFINED AND WIN THEN
-    GJ_LIB_NL$ = CHR$(13)
-$ELSE
-    GJ_LIB_NL$ = CHR$(10)
-$END IF
diff --git a/DUMP/DUMP.BM b/DUMP/DUMP.BM
@@ -71,7 +71,13 @@
 ' @see [1] https://www.php.net/manual/en/function.print-r.php
 '
 $LET GJ_LIB_DUMP_INC_BM = 1
-
+$IF GJ_LIB_NL_BM = UNDEFINED AND WIN THEN
+$LET GJ_LIB_NL_BM = 1
+    GJ_LIB_NL$ = CHR$(13)
+$ELSE
+$LET GJ_LIB_NL_BM = 1
+    GJ_LIB_NL$ = CHR$(10)
+$END IF
 
 
 ''

diff --git a/_GJ_LIB_COMMON.BI b/_GJ_LIB_COMMON.BI
@@ -22,6 +22,7 @@ $IF SLASH = UNDEFINED THEN
     $END IF 
 $END IF
 
-$IF GJ_LIB_NL = UNDEFINED THEN
+$IF GJ_LIB_NL_BI = UNDEFINED THEN
+$LET GJ_LIB_NL_BI = 1
     DIM SHARED GJ_LIB_NL AS STRING
 $END IF
diff --git a/_GJ_LIB_COMMON.BM b/_GJ_LIB_COMMON.BM
@@ -9,8 +9,10 @@ $IF GJLIB_COMMON_BM = UNDEFINED THEN
     $LET GJ_LIB_INC_COMMON_BM = 1 
 $END IF
 
-$IF GJ_LIB_NL = UNDEFINED AND WIN THEN
+$IF GJ_LIB_NL_BM = UNDEFINED AND WIN THEN
+$LET GJ_LIB_NL_BM = 1
     GJ_LIB_NL$ = CHR$(13)
 $ELSE
+$LET GJ_LIB_NL_BM = 1
     GJ_LIB_NL$ = CHR$(10)
 $END IF