optionally allow ORANGE_NAMES_WITH_DOTS

LADSoft · May 12, 2024 · 2e49fd7 · 2e49fd7
1 parent 7921ce8
commit 2e49fd7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/BUSY b/BUSY
@@ -38,7 +38,7 @@ let config : Config {
 
 let config2 : Config {
     .include_dirs += [ . ./src/occopt ./src/util ./src/ocpp ]
-    .defines += [ "ORANGE_NO_MSIL" "ORANGE_NO_INASM" ]
+    .defines += [ "ORANGE_NO_MSIL" "ORANGE_NO_INASM" "ORANGE_NAMES_WITH_DOTS" ]
 }
 
 let common : SourceSet {

diff --git a/src/occopt/optmain.cpp b/src/occopt/optmain.cpp
@@ -203,9 +203,11 @@ void examine_icode(QUAD* head)
 {
     switch (architecture)
     {
-        case ARCHITECTURE_MSIL:
+#ifndef ORANGE_NO_MSIL
+    case ARCHITECTURE_MSIL:
             msil_examine_icode(head);
             break;
+#endif
         case ARCHITECTURE_X86:
             x86_examine_icode(head);
             break;
@@ -565,4 +567,4 @@ int main(int argc, char* argv[])
         printf("occopt timing: %d.%03d\n", (stopTime - startTime) / 1000, (stopTime - startTime) % 1000);
     }
     return 0;
-}
+}
diff --git a/src/occparse/occparse.cpp b/src/occparse/occparse.cpp
@@ -564,7 +564,9 @@ int main(int argc, char* argv[])
         {
             CompletionCompiler::ccNewFile(buffer, true);
         }
+#ifndef ORANGE_NAMES_WITH_DOTS
         Utils::AddExt(buffer, ".C");
+#endif
         if (prm_std.GetExists())
         {
             if (prm_std.GetValue() == "c89")

diff --git a/src/occparse/osutil.cpp b/src/occparse/osutil.cpp
@@ -1018,7 +1018,9 @@ void InsertOneFile(const char* filename, char* path, int drive)
         buffer[0] = a;
     if (!inserted)
     {
+#ifndef ORANGE_NAMES_WITH_DOTS
         Utils::AddExt(buffer, ".c");
+#endif
         newbuffer = (char*)malloc(strlen(buffer) + 1);
         if (!newbuffer)
             return;
@@ -1103,7 +1105,9 @@ void outputfile(char* buf, const char* orgbuf, const char* ext)
     }
     else if (prm_output.GetExists() && !MakeStubsContinue.GetValue() && !MakeStubsContinueUser.GetValue())
     {
+#ifndef ORANGE_NAMES_WITH_DOTS
         Utils::AddExt(buf, ext);
+#endif
     }
     else
     {

diff --git a/src/util/Utils.cpp b/src/util/Utils.cpp
@@ -319,8 +319,10 @@ FILE* Utils::TempName(std::string& name)
  */
 void Utils::AddExt(char* buffer, const char* ext)
 {
+#ifndef ORANGE_NAMES_WITH_DOTS
     char* pos = (char*)strrchr(buffer, '.');
     if (!pos || (*(pos - 1) == '.') || (*(pos + 1) == '\\'))
+#endif
         strcat(buffer, ext);
 }