[doc_tool] Small fix for windows builds. Also add -m32 compile flag.
authorDaniel G <daniel@giritzer.eu>
Mon, 9 Jul 2018 19:50:42 +0000 (21:50 +0200)
committerDaniel G <daniel@giritzer.eu>
Mon, 9 Jul 2018 19:50:42 +0000 (21:50 +0200)
src/Model.cxx
src/doc_tool.cbp
src/doc_tool.depend

index 93b2e61..56e70ab 100644 (file)
@@ -597,7 +597,7 @@ void Model::generateDocument()
     // Inhaltsverzeichnis erzeugen
     if(mHasTableOfContent)
         docSettingsFile << std::endl << "\\setcounter{tocdepth}{" << std::to_string(mTableOfContentDepth) << "}" <<
-        std::endl << "\\tableofcontents" << "\\newpage" << std::endl;
+        std::endl << "\\tableofcontents" << std::endl << "\\newpage" << std::endl;
 
     docSettingsFile.close();
 
index fbe62dd..fa4372f 100644 (file)
@@ -62,6 +62,7 @@
                                <Option compiler="mingw32_compiler" />
                                <Compiler>
                                        <Add option="-O2" />
+                                       <Add option="-m32" />
                                        <Add option="-mwindows" />
                                        <Add option="-DWIN32" />
                                        <Add option="-DUSE_OPENGL32" />
@@ -71,6 +72,7 @@
                                        <Add directory="../src" />
                                </Compiler>
                                <Linker>
+                                       <Add option="-m32" />
                                        <Add option="-mwindows" />
                                        <Add option="-static-libgcc" />
                                        <Add option="-static-libstdc++" />
                                <Option type="0" />
                                <Option compiler="mingw32_compiler" />
                                <Compiler>
+                                       <Add option="-m32" />
                                        <Add option="-g" />
                                        <Add option="-mwindows" />
                                        <Add option="-DWIN32" />
                                        <Add directory="../src" />
                                </Compiler>
                                <Linker>
+                                       <Add option="-m32" />
                                        <Add option="-mwindows" />
                                        <Add option="-static-libgcc" />
                                        <Add option="-static-libstdc++" />
index dc076a2..36ef41d 100644 (file)
        <list>
        <vector>
 
-1526386642 source:/home/giri/workspace/hsd_doku_tool/src/Model.cxx
+1526395355 source:/home/giri/workspace/hsd_doku_tool/src/Model.cxx
        "Model.h"
        <iostream>
        <algorithm>
        <android/log.h>
        <assert.h>
 
-1526387023 source:/home/giri/workspace/hsd_doku_tool/src/View.cxx
+1526388866 source:/home/giri/workspace/hsd_doku_tool/src/View.cxx
        "View.h"
        "Author.h"
        "ChapterIF.h"
        "Subject.h"
        <algorithm>
 
-1526387073 /home/giri/workspace/hsd_doku_tool/src/ViewFluid.h
+1531164934 /home/giri/workspace/hsd_doku_tool/src/ViewFluid.h
        <FL/Fl.H>
        <FL/Fl_Double_Window.H>
-       <FL/Fl_Group.H>
-       <FL/Fl_Output.H>
+       <FL/Fl_Menu_Bar.H>
+       <FL/Fl_Multiline_Output.H>
+       <FL/Fl_Browser.H>
+       <FL/Fl_Menu_Button.H>
        <FL/Fl_Button.H>
+       <FL/Fl_Group.H>
        <FL/Fl_Box.H>
+       <FL/Fl_Output.H>
        <FL/Fl_Text_Editor.H>
-       <FL/Fl_Menu_Button.H>
        <FL/Fl_Check_Button.H>
-       <FL/Fl_Browser.H>
-       <FL/Fl_Menu_Bar.H>
-       <FL/Fl_Multiline_Output.H>
-       <FL/Fl_Progress.H>
        <FL/Fl_Choice.H>
        <FL/Fl_Input.H>
+       <FL/Fl_Progress.H>
        <FL/Fl_Spinner.H>
+       <FL/Fl_Return_Button.H>
        <FL/Fl_Value_Input.H>
        <FL/Fl_Text_Display.H>
 
        <iostream>
        "Object.h"
 
-1526270514 source:/home/giri/workspace/hsd_doku_tool/src/FSHelper.cxx
+1526392941 source:/home/giri/workspace/hsd_doku_tool/src/FSHelper.cxx
        "FSHelper.h"
        <fstream>
        <dirent.h>
        "DoxygenChapter.h"
        "SourceChapter.h"
 
-1526270514 /home/giri/workspace/hsd_doku_tool/src/TextChapter.h
+1526388866 /home/giri/workspace/hsd_doku_tool/src/TextChapter.h
        <iostream>
        "Object.h"
        "ChapterIF.h"
        <fstream>
 
-1526270514 /home/giri/workspace/hsd_doku_tool/src/DoxygenChapter.h
+1526388866 /home/giri/workspace/hsd_doku_tool/src/DoxygenChapter.h
        <iostream>
        "Object.h"
        <algorithm>
 
-1526270514 /home/giri/workspace/hsd_doku_tool/src/SourceChapter.h
+1526388866 /home/giri/workspace/hsd_doku_tool/src/SourceChapter.h
        <iostream>
        "Object.h"
        "ChapterIF.h"