Merge pull request #15 from ninsbl/master

Patch by Jürgen Fischer: don-t-use-file-locking-on-windows and add CMake...

Author: relet

CMakeLists.txt

@@ -0,0 +1,6 @@
+PROJECT(openfyba)
+
+ADD_SUBDIRECTORY(src/GM)
+ADD_SUBDIRECTORY(src/UT)
+ADD_SUBDIRECTORY(src/FYBA)
+ADD_SUBDIRECTORY(doc)

doc/CMakeLists.txt

@@ -0,0 +1,2 @@
+# docdir = $(datadir)/doc/@PACKAGE@
+# doc_DATA = en_EN/translators_needed no_NB/fyba.html no_NB/fyba1.html no_NB/fyba2.html

src/FYBA/CMakeLists.txt

@@ -0,0 +1,30 @@
+INCLUDE_DIRECTORIES(../GM ../UT)
+
+IF(UNIX)
+	ADD_DEFINITIONS(-pedantic -Wno-long-long -Wall -O2 -D_FILE_OFFSET_BITS=64 -DUNIX -DLINUX -fPIC -Wno-write-strings)
+ENDIF(UNIX)
+
+ADD_LIBRARY(fyba STATIC
+	Fyba_Callback.cpp
+	FYBA_DLL.cpp
+	FYHO.cpp
+	FYLD.cpp
+	FYLH.cpp
+	fyln.cpp
+	FYLP.cpp
+	FYLS.cpp
+	FYLX.cpp
+	stdafx.cpp
+	FYBA.cpp
+	Fyba_melding.cpp
+	FYLB.cpp
+	FYLE.cpp
+	FYLI.cpp
+	FYLO.cpp
+	FYLR.cpp
+	FYLU.cpp
+	FYTA.cpp
+)
+
+INSTALL(FILES fyba.h DESTINATION include/fyba)
+INSTALL(TARGETS fyba ARCHIVE DESTINATION lib)

src/FYBA/FYBA_DLL.cpp

@@ -5,6 +5,7 @@
 
 #include "stdafx.h"
 #include "fyba.h"
+#include <Windows.h>
 
 BOOL APIENTRY DllMain( HMODULE hModule,
                        DWORD  ul_reason_for_call,

src/FYBA/Fyba_Callback.cpp

@@ -28,7 +28,7 @@
 
 #include "stdafx.h"
 
-#include <fyba.h>
+#include "fyba.h"
 
 #ifdef WIN32
 #  include <windows.h>

src/FYBA/Fyba_melding.cpp

@@ -36,7 +36,7 @@
 #include <windows.h>
 #endif
 
-#include <fyba.h>
+#include "fyba.h"
 
 //static short sProsent;
 

src/GM/CMakeLists.txt

@@ -0,0 +1,8 @@
+IF(UNIX)
+	ADD_DEFINITIONS(-pedantic -Wno-long-long -Wall -O2 -D_FILE_OFFSET_BITS=64 -DUNIX -DLINUX -fPIC -Wno-write-strings)
+ENDIF(UNIX)
+
+ADD_LIBRARY(gm STATIC GM.cpp stdafx.cpp)
+
+INSTALL(FILES fygm.h DESTINATION include/fyba)
+INSTALL(TARGETS gm ARCHIVE DESTINATION lib)

src/UT/CMakeLists.txt

@@ -0,0 +1,29 @@
+IF(UNIX)
+	ADD_DEFINITIONS(-pedantic -Wno-long-long -Wall -O2 -D_FILE_OFFSET_BITS=64 -DUNIX -DLINUX -fPIC -Wno-write-strings)
+ENDIF(UNIX)
+
+ADD_LIBRARY(ut STATIC
+	ANFORSEL.cpp
+	DELDIR.cpp
+	FILNACMP.cpp
+	INQTID.cpp
+	UT1.cpp
+	UT4.cpp
+	CopyFile.cpp
+	DELFILE.cpp
+	MAKEPATH.cpp
+	stdafx.cpp
+	UT2.cpp
+	CREDIR.cpp
+	DISKINFO.cpp
+	INQSIZE.cpp
+	SETSIZE.cpp
+	StrtPros.cpp
+	UT3.cpp
+	stdafx.h
+	FULLPATH.cpp
+	SPLITPTH.cpp
+)
+
+INSTALL(FILES fyut.h DESTINATION include/fyba)
+INSTALL(TARGETS ut ARCHIVE DESTINATION lib)

src/UT/UT1.cpp

@@ -23,7 +23,7 @@ CD  Eier.......: STATENS KARTVERK / FYSAK-prosjektet
 CD
 CD  #include...: fyut.h
 CD  ==================================================================
-*/ 
+*/
 
 #include "stdafx.h"
 
@@ -45,7 +45,7 @@ CD  ==================================================================
 
 #ifdef LINUX /*This is just a quick fix. The two parameter versions of these are just not portable.*/
 #   define strcpy_s strcpy
-#   define strcat_s strcat 
+#   define strcat_s strcat
 #endif
 
 #ifdef WIN32
@@ -368,16 +368,17 @@ _SH_DENYNO : Permits read and write access
 _SH_SECURE : Sets secure mode (shared read, exclusive write access).
 */
 
-																
+
    // ----- Selve filåpningen
 	if (mode[0] != '\0') {
-#ifdef UNIX
-         fp = fopen(path,mode); 
-#else
+         fp = fopen(path,mode);
+#if 0
+	// TODO: File locking on windows
+	// FIXME: LI_OpenIdxFil always opens in UT_UPDATE mode
       if (mode[0] == 'w' || mode[2] == '+')
       {
          fp = _fsopen(path,mode,_SH_DENYWR);   // Sperrer mot at andre åpner filen for skriving, godtar lesing
-      }           
+      }
       else
       {
          fp = _fsopen(path,mode,_SH_DENYNO);
@@ -415,14 +416,14 @@ _SH_SECURE : Sets secure mode (shared read, exclusive write access).
 		/* UT_FPRINTF(stderr,strerror(*ierr)); */
 	}
 
-   else 
+   else
    {
 		*ierr = UT_ERROR;
 		return (NULL);
 	}
 
 	if (*ierr != UT_OK)  fp=NULL;
-	
+
    return fp;
 }
 
@@ -553,7 +554,7 @@ SK_EntPnt_UT short UT_ReadLine(FILE *pfil,short llin, char *clin)
             ierr = UT_ERROR;
          }
          break;
-      
+
       } else if (c == '\n') {
          *cp = c;
          cp++;
@@ -706,7 +707,7 @@ CD pfil      FILE         i   Peker til filstruktur (def i stdio.h)
 SK_EntPnt_UT short UT_Save (FILE *pfil)
 {
    if (fflush(pfil) == EOF)  return (UT_ERROR);
- 
+
    return(UT_OK);
 }