diff --git a/common/algebra.cpp b/common/algebra.cpp index 1395b165..03bb836d 100644 --- a/common/algebra.cpp +++ b/common/algebra.cpp @@ -2,6 +2,7 @@ // Math and Linear Algebra stuff. // +#include "lc_global.h" #include #include "defines.h" #include "algebra.h" diff --git a/common/camera.cpp b/common/camera.cpp index 35d6194e..79d344ca 100644 --- a/common/camera.cpp +++ b/common/camera.cpp @@ -1,5 +1,6 @@ // Camera object. +#include "lc_global.h" #include #include #include diff --git a/common/console.cpp b/common/console.cpp index 67a6113e..9df437b6 100644 --- a/common/console.cpp +++ b/common/console.cpp @@ -2,6 +2,7 @@ // Debug Console // +#include "lc_global.h" #include #include #include "console.h" diff --git a/common/curve.cpp b/common/curve.cpp index c9646a44..efda5f66 100755 --- a/common/curve.cpp +++ b/common/curve.cpp @@ -1,6 +1,7 @@ // Curve class, used to represent all flexible objects // +#include "lc_global.h" #include #include #include "globals.h" diff --git a/common/debug.cpp b/common/debug.cpp index f4127cd0..a9fdb40e 100644 --- a/common/debug.cpp +++ b/common/debug.cpp @@ -1,3 +1,4 @@ +#include "lc_global.h" #include "opengl.h" #include "debug.h" diff --git a/common/file.cpp b/common/file.cpp index 23825ca3..4ac6803f 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -2,6 +2,7 @@ // Needed to work with the clipboard and undo/redo easily. // NOTE: Because of endianess issues, all I/O must be done from a File class. +#include "lc_global.h" #include #include #include diff --git a/common/globals.cpp b/common/globals.cpp index 8a186efa..5de0b466 100644 --- a/common/globals.cpp +++ b/common/globals.cpp @@ -2,6 +2,7 @@ // Global variables common to all platforms. // +#include "lc_global.h" #include #include "globals.h" diff --git a/common/group.cpp b/common/group.cpp index 89c6299a..46757d66 100644 --- a/common/group.cpp +++ b/common/group.cpp @@ -1,6 +1,7 @@ // Piece group // +#include "lc_global.h" #include #include "group.h" #include "file.h" diff --git a/common/im_bmp.cpp b/common/im_bmp.cpp index f850fa7d..a66c8361 100755 --- a/common/im_bmp.cpp +++ b/common/im_bmp.cpp @@ -1,3 +1,4 @@ +#include "lc_global.h" #include #include #include "config.h" diff --git a/common/im_gif.cpp b/common/im_gif.cpp index 16ef6169..16355a51 100644 --- a/common/im_gif.cpp +++ b/common/im_gif.cpp @@ -1,3 +1,4 @@ +#include "lc_global.h" #include #include #include "image.h" diff --git a/common/im_jpg.cpp b/common/im_jpg.cpp index 9da64b6f..cb671296 100644 --- a/common/im_jpg.cpp +++ b/common/im_jpg.cpp @@ -1,3 +1,4 @@ +#include "lc_global.h" #include #include #include "config.h" diff --git a/common/im_png.cpp b/common/im_png.cpp index e6be0a89..0b003fa7 100755 --- a/common/im_png.cpp +++ b/common/im_png.cpp @@ -1,3 +1,4 @@ +#include "lc_global.h" #include #include "config.h" #include "image.h" diff --git a/common/image.cpp b/common/image.cpp index 1accf6f5..60cf4258 100644 --- a/common/image.cpp +++ b/common/image.cpp @@ -1,6 +1,7 @@ // Image I/O routines // +#include "lc_global.h" #include "opengl.h" #ifdef LC_WINDOWS #include diff --git a/common/keyboard.cpp b/common/keyboard.cpp index 0508d13f..fc816503 100644 --- a/common/keyboard.cpp +++ b/common/keyboard.cpp @@ -2,6 +2,7 @@ // Code to handle user-defined keyboard shortcuts. // +#include "lc_global.h" #include #include "system.h" #include "keyboard.h" diff --git a/common/lc_application.cpp b/common/lc_application.cpp index ef57f5dd..7241f166 100644 --- a/common/lc_application.cpp +++ b/common/lc_application.cpp @@ -1,3 +1,4 @@ +#include "lc_global.h" #include #include "lc_application.h" #include "library.h" diff --git a/common/lc_global.h b/common/lc_global.h new file mode 100644 index 00000000..cbf3a3c7 --- /dev/null +++ b/common/lc_global.h @@ -0,0 +1,17 @@ +#ifndef _LC_GLOBAL_H_ +#define _LC_GLOBAL_H_ + +#include "config.h" +#include "defines.h" + +// Check for supported platforms. +#if !defined(LC_WINDOWS) && !defined(LC_LINUX) +#error No OS defined. +#endif + +// Precompiled headers. +#if LC_WINDOWS +#include "stdafx.h" +#endif + +#endif // _LC_GLOBAL_H_ diff --git a/common/library.cpp b/common/library.cpp index a0eeffc7..d674156c 100755 --- a/common/library.cpp +++ b/common/library.cpp @@ -2,6 +2,7 @@ // Pieces library management // +#include "lc_global.h" #include #include "library.h" #include "file.h" diff --git a/common/light.cpp b/common/light.cpp index 2e545a4c..f0ea2d70 100644 --- a/common/light.cpp +++ b/common/light.cpp @@ -1,5 +1,6 @@ // Light object. +#include "lc_global.h" #include #include #include diff --git a/common/mainwnd.cpp b/common/mainwnd.cpp index 9ba8c673..0931effe 100644 --- a/common/mainwnd.cpp +++ b/common/mainwnd.cpp @@ -2,6 +2,7 @@ // Main LeoCAD window // +#include "lc_global.h" #include #include "mainwnd.h" #include "system.h" diff --git a/common/matrix.cpp b/common/matrix.cpp index 7b3d8980..78bd4f07 100644 --- a/common/matrix.cpp +++ b/common/matrix.cpp @@ -2,6 +2,7 @@ // 4x4 Matrix class // +#include "lc_global.h" #include #include #include diff --git a/common/message.cpp b/common/message.cpp index 02d6e5f2..3886918e 100644 --- a/common/message.cpp +++ b/common/message.cpp @@ -2,6 +2,7 @@ // LeoCAD messaging system // +#include "lc_global.h" #include "message.h" Messenger::Messenger () diff --git a/common/minifig.cpp b/common/minifig.cpp index 205743b6..2c6845b4 100644 --- a/common/minifig.cpp +++ b/common/minifig.cpp @@ -2,6 +2,7 @@ // Minifig Wizard base class, calculates position/rotation of all pieces. // +#include "lc_global.h" #include #include #include diff --git a/common/object.cpp b/common/object.cpp index 0d8c0798..db1fd670 100755 --- a/common/object.cpp +++ b/common/object.cpp @@ -1,6 +1,7 @@ // Base class for all drawable objects // +#include "lc_global.h" #include #include #include diff --git a/common/opengl.cpp b/common/opengl.cpp index c008b2ff..cc8a8901 100755 --- a/common/opengl.cpp +++ b/common/opengl.cpp @@ -2,6 +2,7 @@ // Routines to load the OpenGL libraries dynamically // +#include "lc_global.h" #include #include #include "opengl.h" diff --git a/common/piece.cpp b/common/piece.cpp index 2073b2d3..396f006b 100644 --- a/common/piece.cpp +++ b/common/piece.cpp @@ -1,6 +1,7 @@ // A piece object in the LeoCAD world. // +#include "lc_global.h" #include #include #include diff --git a/common/pieceinf.cpp b/common/pieceinf.cpp index 10a7bbc0..6d4a09eb 100644 --- a/common/pieceinf.cpp +++ b/common/pieceinf.cpp @@ -1,6 +1,7 @@ // Information about how to draw a piece and some more stuff. // +#include "lc_global.h" #include #include #include diff --git a/common/preview.cpp b/common/preview.cpp index fb8f67c9..a6f45b32 100644 --- a/common/preview.cpp +++ b/common/preview.cpp @@ -2,6 +2,7 @@ // Piece Preview window // +#include "lc_global.h" #include "preview.h" #include "globals.h" #include "project.h" diff --git a/common/project.cpp b/common/project.cpp index 5d556bb6..896ee209 100644 --- a/common/project.cpp +++ b/common/project.cpp @@ -1,6 +1,7 @@ // Everything that is a part of a LeoCAD project goes here. // +#include "lc_global.h" #include #include #include diff --git a/common/quant.cpp b/common/quant.cpp index d2072a31..dc3f90c6 100644 --- a/common/quant.cpp +++ b/common/quant.cpp @@ -1,6 +1,7 @@ /////////////////////////////////////// // DL1 Quantization +#include "lc_global.h" #include #include #include diff --git a/common/str.cpp b/common/str.cpp index c176f6ec..78313df0 100644 --- a/common/str.cpp +++ b/common/str.cpp @@ -2,6 +2,7 @@ // General purpose string class // +#include "lc_global.h" #include #include "str.h" diff --git a/common/terrain.cpp b/common/terrain.cpp index 4e24a935..30d76995 100644 --- a/common/terrain.cpp +++ b/common/terrain.cpp @@ -1,6 +1,7 @@ // Terrain: a Bezier surface. // +#include "lc_global.h" #include #include #include diff --git a/common/texfont.cpp b/common/texfont.cpp index a5c3b5d1..5d432c41 100644 --- a/common/texfont.cpp +++ b/common/texfont.cpp @@ -2,6 +2,7 @@ // Texture Font // +#include "lc_global.h" #include "globals.h" #include "project.h" #include "texfont.h" diff --git a/common/texture.cpp b/common/texture.cpp index 8c92e679..e6df49c9 100644 --- a/common/texture.cpp +++ b/common/texture.cpp @@ -1,6 +1,7 @@ // Texture object. // +#include "lc_global.h" #include #include #include "opengl.h" diff --git a/common/tr.cpp b/common/tr.cpp index 235e396c..1b48848b 100644 --- a/common/tr.cpp +++ b/common/tr.cpp @@ -2,6 +2,7 @@ // ////////////////////////////////////////////////////////////////////// +#include "lc_global.h" #include #include "opengl.h" #include "tr.h" diff --git a/common/vector.cpp b/common/vector.cpp index baf952ad..cf1801f9 100644 --- a/common/vector.cpp +++ b/common/vector.cpp @@ -1,3 +1,4 @@ +#include "lc_global.h" #include #include "vector.h" #include "defines.h" diff --git a/common/view.cpp b/common/view.cpp index 85c77e4f..b576105f 100644 --- a/common/view.cpp +++ b/common/view.cpp @@ -2,6 +2,7 @@ // View the project contents // +#include "lc_global.h" #include #include "project.h" #include "view.h" diff --git a/win/Caddoc.cpp b/win/Caddoc.cpp index e43567ec..2a695f4c 100644 --- a/win/Caddoc.cpp +++ b/win/Caddoc.cpp @@ -1,7 +1,4 @@ -// CADDoc.cpp : implementation of the CCADDoc class -// - -#include "stdafx.h" +#include "lc_global.h" #include "LeoCAD.h" #include "CADDoc.h" diff --git a/win/Cadview.cpp b/win/Cadview.cpp index 22024857..c9f981e9 100644 --- a/win/Cadview.cpp +++ b/win/Cadview.cpp @@ -1,7 +1,4 @@ -// CADView.cpp : implementation of the CCADView class -// - -#include "stdafx.h" +#include "lc_global.h" #include "LeoCAD.h" #include diff --git a/win/Clrpick.cpp b/win/Clrpick.cpp index e9103c41..873d139f 100644 --- a/win/Clrpick.cpp +++ b/win/Clrpick.cpp @@ -1,7 +1,4 @@ -// ColorPicker.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "ClrPopup.h" #include "ClrPick.h" diff --git a/win/Clrpopup.cpp b/win/Clrpopup.cpp index d89b06dd..9bb03a3c 100644 --- a/win/Clrpopup.cpp +++ b/win/Clrpopup.cpp @@ -1,7 +1,4 @@ -// ColorPopup.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include #include "ClrPick.h" #include "ClrPopup.h" diff --git a/win/Colorlst.cpp b/win/Colorlst.cpp index 9e7ee03b..7861b2b5 100644 --- a/win/Colorlst.cpp +++ b/win/Colorlst.cpp @@ -1,7 +1,4 @@ -// ColorLst.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "ColorLst.h" #include "globals.h" diff --git a/win/EdGrpDlg.cpp b/win/EdGrpDlg.cpp index 8ab3b8f5..cf0f0681 100644 --- a/win/EdGrpDlg.cpp +++ b/win/EdGrpDlg.cpp @@ -1,7 +1,4 @@ -// EdGrpDlg.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "EdGrpDlg.h" #include "globals.h" diff --git a/win/Figdlg.cpp b/win/Figdlg.cpp index 037deda7..82151c47 100644 --- a/win/Figdlg.cpp +++ b/win/Figdlg.cpp @@ -1,7 +1,4 @@ -// FigDlg.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "LeoCAD.h" #include "FigDlg.h" #include "minifig.h" diff --git a/win/Groupdlg.cpp b/win/Groupdlg.cpp index 8c65c6b9..ce12fb00 100644 --- a/win/Groupdlg.cpp +++ b/win/Groupdlg.cpp @@ -1,7 +1,4 @@ -// GroupDlg.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "GroupDlg.h" diff --git a/win/GrpTree.cpp b/win/GrpTree.cpp index 362fa85e..a372ac19 100644 --- a/win/GrpTree.cpp +++ b/win/GrpTree.cpp @@ -1,7 +1,4 @@ -// GrpTree.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "GrpTree.h" #include "group.h" diff --git a/win/Htmldlg.cpp b/win/Htmldlg.cpp index 811647d5..f282eb88 100644 --- a/win/Htmldlg.cpp +++ b/win/Htmldlg.cpp @@ -1,7 +1,4 @@ -// HTMLDlg.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "HTMLDlg.h" #include "ImageDlg.h" diff --git a/win/Imagedlg.cpp b/win/Imagedlg.cpp index f2ca2b1d..599c8e63 100644 --- a/win/Imagedlg.cpp +++ b/win/Imagedlg.cpp @@ -1,7 +1,4 @@ -// ImageDlg.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "ImageDlg.h" diff --git a/win/Leocad.cpp b/win/Leocad.cpp index ada4e42b..a0b1aa19 100644 --- a/win/Leocad.cpp +++ b/win/Leocad.cpp @@ -1,7 +1,4 @@ -// LeoCAD.cpp : Defines the class behaviors for the application. -// - -#include "stdafx.h" +#include "lc_global.h" #include "LeoCAD.h" #include "MainFrm.h" diff --git a/win/Libdlg.cpp b/win/Libdlg.cpp index d9473776..c09d6a2a 100644 --- a/win/Libdlg.cpp +++ b/win/Libdlg.cpp @@ -1,7 +1,4 @@ -// LibDlg.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "LibDlg.h" #include "GroupDlg.h" diff --git a/win/Mainfrm.cpp b/win/Mainfrm.cpp index 339d79af..4c731f83 100644 --- a/win/Mainfrm.cpp +++ b/win/Mainfrm.cpp @@ -1,9 +1,4 @@ -// MainFrm.cpp : implementation of the CMainFrame class -// - -#include "stdafx.h" -#include -#include +#include "lc_global.h" #include "LeoCAD.h" #include "MainFrm.h" #include "Camera.h" @@ -37,51 +32,6 @@ void mainframe_listener (int message, void *data, void *user) } } -static void mainframe_console_func (LC_CONSOLE_LEVEL level, const char* text, void* user_data) -{ - CRichEditCtrl& ctrl = ((CRichEditView *) user_data)->GetRichEditCtrl (); - CHARFORMAT cf; - - cf.cbSize = sizeof (cf); - cf.dwMask = CFM_COLOR; - cf.dwEffects = 0; - - switch (level) - { - case LC_CONSOLE_ERROR: - cf.crTextColor = RGB (255, 0, 0); - break; - - case LC_CONSOLE_WARNING: - cf.crTextColor = RGB (0, 0, 255); - break; - - case LC_CONSOLE_DEBUG: - cf.crTextColor = RGB (0, 128, 0); - break; - - case LC_CONSOLE_MISC: - default: - cf.crTextColor = RGB (0, 0, 0); - break; - } - - ctrl.SetRedraw(FALSE); - - // Go to the end of the window text. - int TextStart = ctrl.GetWindowTextLength(); - ctrl.SetSel(TextStart, -1); - - // Change color. - ctrl.SetSelectionCharFormat(cf); - - // Append new text. - ctrl.ReplaceSel(text); - - ctrl.SetRedraw(TRUE); - ctrl.InvalidateRect(NULL, FALSE); -} - ///////////////////////////////////////////////////////////////////////////// // CMainFrame diff --git a/win/Piecebar.cpp b/win/Piecebar.cpp index c9df8291..ecb894eb 100644 --- a/win/Piecebar.cpp +++ b/win/Piecebar.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "lc_global.h" #include "resource.h" #include "piecebar.h" #include "library.h" diff --git a/win/Piececmb.cpp b/win/Piececmb.cpp index f1f3e292..d4442372 100644 --- a/win/Piececmb.cpp +++ b/win/Piececmb.cpp @@ -1,7 +1,4 @@ -// PieceCmb.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "PieceCmb.h" #include "PieceBar.h" diff --git a/win/Pieceprv.cpp b/win/Pieceprv.cpp index 17205599..b4a6f9d5 100644 --- a/win/Pieceprv.cpp +++ b/win/Pieceprv.cpp @@ -1,7 +1,4 @@ -// PiecePrv.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "PiecePrv.h" #include "Tools.h" diff --git a/win/Povdlg.cpp b/win/Povdlg.cpp index e3c8a66b..e95cf2d5 100644 --- a/win/Povdlg.cpp +++ b/win/Povdlg.cpp @@ -1,7 +1,4 @@ -// POVDlg.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "POVDlg.h" #include "tools.h" diff --git a/win/Prefpage.cpp b/win/Prefpage.cpp index 9e4d2545..cb611cdb 100644 --- a/win/Prefpage.cpp +++ b/win/Prefpage.cpp @@ -1,7 +1,4 @@ -// PrefPage.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "resource.h" #include "PrefPage.h" #include "Tools.h" diff --git a/win/Prefsht.cpp b/win/Prefsht.cpp index 5caf8d13..0f028782 100644 --- a/win/Prefsht.cpp +++ b/win/Prefsht.cpp @@ -1,7 +1,4 @@ -// PrefSht.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "resource.h" #include "PrefSht.h" #include "defines.h" diff --git a/win/Print.cpp b/win/Print.cpp index 647ab78b..7a249c0d 100644 --- a/win/Print.cpp +++ b/win/Print.cpp @@ -1,9 +1,4 @@ -// Print catalog and pieces list -// - -// TODO: rewrite everything - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include #include "Print.h" @@ -16,11 +11,13 @@ #include "library.h" #include "lc_application.h" +// TODO: rewrite everything + static void PrintCatalogThread (CWnd* pParent, CFrameWndEx* pMainFrame) { CCADView* pView = (CCADView*)pMainFrame->GetActiveView(); CPrintDialog* PD = new CPrintDialog(FALSE, PD_ALLPAGES|PD_USEDEVMODECOPIES|PD_NOSELECTION|PD_ENABLEPRINTHOOK, pParent); - PiecesLibrary *pLib = lcGetPiecesLibrary(); + PiecesLibrary *pLib = lcGetPiecesLibrary(); int bricks = 0; for (int j = 0; j < pLib->GetPieceCount (); j++) diff --git a/win/Propspgs.cpp b/win/Propspgs.cpp index 4bd242ed..d13bc1c1 100644 --- a/win/Propspgs.cpp +++ b/win/Propspgs.cpp @@ -1,7 +1,4 @@ -// PropsPgs.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "resource.h" #include "PropsPgs.h" #include "defines.h" diff --git a/win/Seldlg.cpp b/win/Seldlg.cpp index 9667c7a0..bd5c6e9b 100644 --- a/win/Seldlg.cpp +++ b/win/Seldlg.cpp @@ -1,7 +1,4 @@ -// SelDlg.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "SelDlg.h" diff --git a/win/Stdafx.h b/win/Stdafx.h index 9a3c85cb..d16ea699 100644 --- a/win/Stdafx.h +++ b/win/Stdafx.h @@ -15,6 +15,7 @@ #define _WIN32_WINNT 0x500 #define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_DEPRECATE 1 +#define _CRT_NONSTDC_NO_WARNINGS 1 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/win/Stepdlg.cpp b/win/Stepdlg.cpp index b0dff780..d9b92615 100644 --- a/win/Stepdlg.cpp +++ b/win/Stepdlg.cpp @@ -1,7 +1,4 @@ -// StepDlg.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "StepDlg.h" diff --git a/win/Steppop.cpp b/win/Steppop.cpp index cd99cc3d..5606e698 100644 --- a/win/Steppop.cpp +++ b/win/Steppop.cpp @@ -1,7 +1,4 @@ -// StepPop.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "StepPop.h" #include "project.h" diff --git a/win/System.cpp b/win/System.cpp index 908027ac..39cdd30e 100644 --- a/win/System.cpp +++ b/win/System.cpp @@ -1,7 +1,4 @@ -// System user interface. -// - -#include "stdafx.h" +#include "lc_global.h" #include #include #include "leocad.h" diff --git a/win/Teropdlg.cpp b/win/Teropdlg.cpp index b11b846a..84af3cac 100644 --- a/win/Teropdlg.cpp +++ b/win/Teropdlg.cpp @@ -1,7 +1,4 @@ -// TerOpDlg.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "TerOpDlg.h" #include "Terrain.h" diff --git a/win/Terrdlg.cpp b/win/Terrdlg.cpp index 9bc50e4b..cec75c8d 100644 --- a/win/Terrdlg.cpp +++ b/win/Terrdlg.cpp @@ -1,7 +1,4 @@ -// TerrDlg.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "Terrain.h" #include "TerrWnd.h" diff --git a/win/Terrwnd.cpp b/win/Terrwnd.cpp index e6f1a7a9..3e8c80d2 100644 --- a/win/Terrwnd.cpp +++ b/win/Terrwnd.cpp @@ -1,7 +1,4 @@ -// TerrWnd.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "LeoCAD.h" #include "TerrWnd.h" #include "Terrain.h" diff --git a/win/Tools.cpp b/win/Tools.cpp index e8bc76c6..26b394c0 100644 --- a/win/Tools.cpp +++ b/win/Tools.cpp @@ -1,7 +1,4 @@ -// Tools.cpp : Misc. routines -// - -#include "stdafx.h" +#include "lc_global.h" #include "Tools.h" #include "resource.h" #include "PrefSht.h" diff --git a/win/aboutdlg.cpp b/win/aboutdlg.cpp index b1684805..0a9c6629 100644 --- a/win/aboutdlg.cpp +++ b/win/aboutdlg.cpp @@ -1,7 +1,4 @@ -// AboutDlg.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "AboutDlg.h" #include "config.h" diff --git a/win/arraydlg.cpp b/win/arraydlg.cpp index 3d16bb55..f95ac6af 100644 --- a/win/arraydlg.cpp +++ b/win/arraydlg.cpp @@ -1,7 +1,4 @@ -// ArrayDlg.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "ArrayDlg.h" diff --git a/win/basewnd.cpp b/win/basewnd.cpp index 320e38a8..6cd7e6ad 100644 --- a/win/basewnd.cpp +++ b/win/basewnd.cpp @@ -1,8 +1,4 @@ -// -// Base window class -// - -#include "stdafx.h" +#include "lc_global.h" #include "basewnd.h" BaseWnd::BaseWnd (BaseWnd *parent, int menu_count) diff --git a/win/cadbar.cpp b/win/cadbar.cpp index d808c0b0..3a13f80a 100644 --- a/win/cadbar.cpp +++ b/win/cadbar.cpp @@ -1,8 +1,4 @@ -// CADBar.cpp: implementation of the CCADStatusBar class. -// -////////////////////////////////////////////////////////////////////// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "CADBar.h" #include "StepPop.h" diff --git a/win/categdlg.cpp b/win/categdlg.cpp index cbee4315..fd832b11 100644 --- a/win/categdlg.cpp +++ b/win/categdlg.cpp @@ -1,7 +1,4 @@ -// categdlg.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "categdlg.h" diff --git a/win/disabtab.cpp b/win/disabtab.cpp index 69e5a74a..df72977f 100644 --- a/win/disabtab.cpp +++ b/win/disabtab.cpp @@ -5,7 +5,7 @@ // // CTabCtrlWithDisable implements a CTabCtrl with tabs that you can disable. -#include "StdAfx.h" +#include "lc_global.h" #include "DisabTab.h" #ifdef _DEBUG diff --git a/win/dynsplit.cpp b/win/dynsplit.cpp index dda90537..ffc1ea80 100644 --- a/win/dynsplit.cpp +++ b/win/dynsplit.cpp @@ -3,7 +3,7 @@ // to make it easier to dynamically split windows at run time. // -#include "stdafx.h" +#include "lc_global.h" #include "dynsplit.h" BOOL CDynamicSplitterWnd::AttachWindow(CWnd* Wnd, int Row, int Col) diff --git a/win/glwindow.cpp b/win/glwindow.cpp index f8a1e340..0c47d0b4 100644 --- a/win/glwindow.cpp +++ b/win/glwindow.cpp @@ -1,8 +1,4 @@ -// -// OpenGL window -// - -#include "stdafx.h" +#include "lc_global.h" #include "glwindow.h" #include "tools.h" diff --git a/win/ipedit.cpp b/win/ipedit.cpp index 6098a8a3..85085400 100644 --- a/win/ipedit.cpp +++ b/win/ipedit.cpp @@ -1,7 +1,4 @@ -// InPlaceEdit.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "IPEdit.h" #include "TerrCtrl.h" diff --git a/win/keyedit.cpp b/win/keyedit.cpp index e566496d..b1f0b73c 100644 --- a/win/keyedit.cpp +++ b/win/keyedit.cpp @@ -1,7 +1,4 @@ -// keyedit.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "keyedit.h" #include "keyboard.h" diff --git a/win/leocad.vcxproj b/win/leocad.vcxproj index d831e05d..b833055c 100644 --- a/win/leocad.vcxproj +++ b/win/leocad.vcxproj @@ -50,6 +50,7 @@ Disabled WIN32;_WINDOWS;_DEBUG;LC_WINDOWS;LC_DEBUG;%(PreprocessorDefinitions) ../common;../win + lc_global.h Windows @@ -77,6 +78,7 @@ true WIN32;_WINDOWS;NDEBUG;LC_WINDOWS;%(PreprocessorDefinitions) ../common;../win + lc_global.h Windows @@ -144,6 +146,8 @@ Create Create + lc_global.h + lc_global.h @@ -156,154 +160,47 @@ - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - ./jpeglib;%(AdditionalIncludeDirectories) - ./jpeglib;%(AdditionalIncludeDirectories) - NotUsing - NotUsing - + + + + + + + + + + ./jpeglib;%(AdditionalIncludeDirectories) ./jpeglib;%(AdditionalIncludeDirectories) - NotUsing - NotUsing ./libpng;./zlib;%(AdditionalIncludeDirectories) ./libpng;./zlib;%(AdditionalIncludeDirectories) - NotUsing - NotUsing - - - ./jpeglib;%(AdditionalIncludeDirectories) - ./jpeglib;%(AdditionalIncludeDirectories) - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing + + + + + + + + + + + + + + + + + + + + + + + @@ -414,6 +311,7 @@ + diff --git a/win/leocad.vcxproj.filters b/win/leocad.vcxproj.filters index 26e70208..49840b38 100644 --- a/win/leocad.vcxproj.filters +++ b/win/leocad.vcxproj.filters @@ -816,14 +816,17 @@ Common Header Files - - Source Files - Header Files + + Common Header Files + + + Header Files + - Source Files + Header Files diff --git a/win/progdlg.cpp b/win/progdlg.cpp index e0cc2851..098232fa 100644 --- a/win/progdlg.cpp +++ b/win/progdlg.cpp @@ -1,7 +1,4 @@ -// ProgDlg.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "ProgDlg.h" diff --git a/win/propertiesgridctrl.cpp b/win/propertiesgridctrl.cpp index 81a84dcd..2d6d09a9 100644 --- a/win/propertiesgridctrl.cpp +++ b/win/propertiesgridctrl.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "lc_global.h" #include "propertiesgridctrl.h" #include "globals.h" diff --git a/win/propertiespane.cpp b/win/propertiespane.cpp index b6f4ae7c..2c248b7e 100644 --- a/win/propertiespane.cpp +++ b/win/propertiespane.cpp @@ -1,7 +1,4 @@ -// propertiespane.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "propertiespane.h" #include "project.h" diff --git a/win/propssht.cpp b/win/propssht.cpp index 8cbffedd..0df57e55 100644 --- a/win/propssht.cpp +++ b/win/propssht.cpp @@ -1,7 +1,4 @@ -// PropsSht.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "resource.h" #include "PropsSht.h" diff --git a/win/splitter.cpp b/win/splitter.cpp index 89244738..e59b3422 100644 --- a/win/splitter.cpp +++ b/win/splitter.cpp @@ -1,7 +1,4 @@ -// Splitter.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "resource.h" #include "Splitter.h" diff --git a/win/stdafx.cpp b/win/stdafx.cpp index b8b1ff4b..6b688edf 100644 --- a/win/stdafx.cpp +++ b/win/stdafx.cpp @@ -2,5 +2,4 @@ // LeoCAD.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" - +#include "lc_global.h" diff --git a/win/terrctrl.cpp b/win/terrctrl.cpp index 9fcb8a36..c9c4dec0 100644 --- a/win/terrctrl.cpp +++ b/win/terrctrl.cpp @@ -1,7 +1,4 @@ -// TerrCtrl.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "LeoCAD.h" #include "TerrCtrl.h" #include "IPEdit.h" diff --git a/win/texdlg.cpp b/win/texdlg.cpp index 1bafd029..49fcc228 100644 --- a/win/texdlg.cpp +++ b/win/texdlg.cpp @@ -1,7 +1,4 @@ -// texdlg.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "texdlg.h" #include "library.h" diff --git a/win/transdlg.cpp b/win/transdlg.cpp index fb7cb189..dd85d746 100644 --- a/win/transdlg.cpp +++ b/win/transdlg.cpp @@ -1,7 +1,4 @@ -// transdlg.cpp : implementation file -// - -#include "stdafx.h" +#include "lc_global.h" #include "leocad.h" #include "transdlg.h" diff --git a/win/win_gl.cpp b/win/win_gl.cpp index 58af6cd1..0ec3e75c 100755 --- a/win/win_gl.cpp +++ b/win/win_gl.cpp @@ -1,8 +1,4 @@ -// -// Windows OpenGL functions -// - -#include "stdafx.h" +#include "lc_global.h" #include "opengl.h" static HMODULE gl_module;