From 9a713b11497592f803b05e106dcd5525038bd5d1 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 24 Oct 2002 11:21:47 +0000 Subject: [PATCH] Applied patch [ 623736 ] Build and use FL as DLL This patch allows FL to be build as a DLL with the VC project files, I was only able to at chief it with the VC projects because the make file for building libs doesn't have any rule to build DLLs (at least I didn't see how to do it). However the FL demo applications can be build using FL in DLL form with MSVC project files and VC make files (as mentioned before the FL DLL it self can only be build using VC projects). This patch includes 2 files; 1 to change current FL files to work in DLL form and 1 extra include file that needs to be added in the FL include directory. Small note: if you want to use FL as a DLL you need to use wxWin as a DLL. Thanks, Hans. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/include/wx/fl/antiflickpl.h | 2 +- contrib/include/wx/fl/bardragpl.h | 2 +- contrib/include/wx/fl/barhintspl.h | 2 +- contrib/include/wx/fl/cbcustom.h | 2 +- contrib/include/wx/fl/controlbar.h | 39 +++++----- contrib/include/wx/fl/dyntbar.h | 17 ++-- contrib/include/wx/fl/dyntbarhnd.h | 2 +- contrib/include/wx/fl/fldefs.h | 50 ++++++++++++ contrib/include/wx/fl/frmview.h | 4 +- contrib/include/wx/fl/garbagec.h | 3 +- contrib/include/wx/fl/gcupdatesmgr.h | 2 +- contrib/include/wx/fl/hintanimpl.h | 8 +- contrib/include/wx/fl/newbmpbtn.h | 10 +-- contrib/include/wx/fl/panedrawpl.h | 2 +- contrib/include/wx/fl/rowdragpl.h | 4 +- contrib/include/wx/fl/rowlayoutpl.h | 2 +- contrib/include/wx/fl/toolwnd.h | 15 ++-- contrib/include/wx/fl/updatesmgr.h | 2 +- contrib/samples/fl/fl_demo1/fl_demo.dsp | 69 +++++++++++++++- contrib/samples/fl/fl_demo1/makefile.vc | 14 ++++ contrib/samples/fl/fl_demo2/fl_demo.dsp | 69 +++++++++++++++- contrib/samples/fl/fl_demo2/makefile.vc | 14 ++++ contrib/samples/fl/fl_sample1/fl_demo.dsp | 69 +++++++++++++++- contrib/samples/fl/fl_sample1/makefile.vc | 14 ++++ contrib/samples/fl/fl_sample2/fl_demo.dsp | 69 +++++++++++++++- contrib/samples/fl/fl_sample2/makefile.vc | 14 ++++ contrib/samples/fl/fl_sample3/fl_demo.dsp | 69 +++++++++++++++- contrib/samples/fl/fl_sample3/makefile.vc | 14 ++++ contrib/src/fl/flVC.dsp | 95 +++++++++++++++++++++-- contrib/src/fl/newbmpbtn.cpp | 48 +----------- 30 files changed, 602 insertions(+), 124 deletions(-) create mode 100644 contrib/include/wx/fl/fldefs.h diff --git a/contrib/include/wx/fl/antiflickpl.h b/contrib/include/wx/fl/antiflickpl.h index 32b0eb2988..e8569aa6df 100644 --- a/contrib/include/wx/fl/antiflickpl.h +++ b/contrib/include/wx/fl/antiflickpl.h @@ -26,7 +26,7 @@ antiflicker plugins within the application. Locking for multithreaded applications is not yet implemented. */ -class cbAntiflickerPlugin : public cbPluginBase +class WXFL_DECLSPEC cbAntiflickerPlugin : public cbPluginBase { DECLARE_DYNAMIC_CLASS( cbAntiflickerPlugin ) protected: diff --git a/contrib/include/wx/fl/bardragpl.h b/contrib/include/wx/fl/bardragpl.h index 953b8dff9c..6c225dd237 100644 --- a/contrib/include/wx/fl/bardragpl.h +++ b/contrib/include/wx/fl/bardragpl.h @@ -23,7 +23,7 @@ Plugin class implementing bar dragging. */ -class cbBarDragPlugin : public cbPluginBase +class WXFL_DECLSPEC cbBarDragPlugin : public cbPluginBase { DECLARE_DYNAMIC_CLASS( cbBarDragPlugin ) protected: diff --git a/contrib/include/wx/fl/barhintspl.h b/contrib/include/wx/fl/barhintspl.h index 51a503145c..5f8da11d6d 100644 --- a/contrib/include/wx/fl/barhintspl.h +++ b/contrib/include/wx/fl/barhintspl.h @@ -24,7 +24,7 @@ This class intercepts bar-decoration and sizing events, and draws 3D hints around fixed and flexible bars, similar to those in Microsoft DevStudio 6.x */ -class cbBarHintsPlugin : public cbPluginBase +class WXFL_DECLSPEC cbBarHintsPlugin : public cbPluginBase { DECLARE_DYNAMIC_CLASS( cbBarHintsPlugin ) diff --git a/contrib/include/wx/fl/cbcustom.h b/contrib/include/wx/fl/cbcustom.h index 93ec7f7f43..6eaf27cfd4 100644 --- a/contrib/include/wx/fl/cbcustom.h +++ b/contrib/include/wx/fl/cbcustom.h @@ -24,7 +24,7 @@ menu and handling basic customization such as floating and horizontal/vertical alignment of the bar. */ -class cbSimpleCustomizationPlugin : public cbPluginBase +class WXFL_DECLSPEC cbSimpleCustomizationPlugin : public cbPluginBase { public: DECLARE_DYNAMIC_CLASS( cbSimpleCustomizationPlugin ) diff --git a/contrib/include/wx/fl/controlbar.h b/contrib/include/wx/fl/controlbar.h index dbe944fc9d..db829bc618 100644 --- a/contrib/include/wx/fl/controlbar.h +++ b/contrib/include/wx/fl/controlbar.h @@ -21,30 +21,31 @@ #include "wx/string.h" #include "wx/window.h" #include "wx/dynarray.h" +#include "wx/fl/fldefs.h" #define WXCONTROLBAR_VERSION 1.3 // forward declarations -class wxFrameLayout; +class WXFL_DECLSPEC wxFrameLayout; -class cbDockPane; -class cbUpdatesManagerBase; -class cbBarDimHandlerBase; -class cbPluginBase; -class cbPluginEvent; -class cbPaneDrawPlugin; +class WXFL_DECLSPEC cbDockPane; +class WXFL_DECLSPEC cbUpdatesManagerBase; +class WXFL_DECLSPEC cbBarDimHandlerBase; +class WXFL_DECLSPEC cbPluginBase; +class WXFL_DECLSPEC cbPluginEvent; +class WXFL_DECLSPEC cbPaneDrawPlugin; -class cbBarInfo; -class cbRowInfo; -class cbDimInfo; -class cbCommonPaneProperties; +class WXFL_DECLSPEC cbBarInfo; +class WXFL_DECLSPEC cbRowInfo; +class WXFL_DECLSPEC cbDimInfo; +class WXFL_DECLSPEC cbCommonPaneProperties; typedef cbBarInfo* BarInfoPtrT; typedef cbRowInfo* RowInfoPtrT; -WX_DEFINE_ARRAY( BarInfoPtrT, BarArrayT ); -WX_DEFINE_ARRAY( RowInfoPtrT, RowArrayT ); +WXFL_DEFINE_ARRAY( BarInfoPtrT, BarArrayT ); +WXFL_DEFINE_ARRAY( RowInfoPtrT, RowArrayT ); // control bar states @@ -97,7 +98,7 @@ Helper class, used for spying for unhandled mouse events on control bars and forwarding them to the frame layout. */ -class cbBarSpy : public wxEvtHandler +class WXFL_DECLSPEC cbBarSpy : public wxEvtHandler { public: DECLARE_DYNAMIC_CLASS( cbBarSpy ) @@ -129,7 +130,7 @@ which can be docked along the top, bottom, right, or left side of the parent frame. */ -class wxFrameLayout : public wxEvtHandler +class WXFL_DECLSPEC wxFrameLayout : public wxEvtHandler { public: // Default constructor, used only for serialization. @@ -647,7 +648,7 @@ used by any particular updates-manager to store auxiliary information to be used by its updating algorithm. */ -class cbUpdateMgrData : public wxObject +class WXFL_DECLSPEC cbUpdateMgrData : public wxObject { DECLARE_DYNAMIC_CLASS( cbUpdateMgrData ) public: @@ -687,7 +688,7 @@ to adjust the values in cbDimInfo::mSizes accordingly. Specific handlers can be hooked up to specific types of bar. */ -class cbBarDimHandlerBase : public wxObject +class WXFL_DECLSPEC cbBarDimHandlerBase : public wxObject { DECLARE_ABSTRACT_CLASS( cbBarDimHandlerBase ) @@ -725,7 +726,7 @@ Helper class used internally by the wxFrameLayout class. Holds and manages information about bar dimensions. */ -class cbDimInfo : public wxObject +class WXFL_DECLSPEC cbDimInfo : public wxObject { DECLARE_DYNAMIC_CLASS( cbDimInfo ) public: @@ -824,7 +825,7 @@ public: }; // FIXME: this array definition compiles but probably doesn't do what was intended (GD) -WX_DEFINE_ARRAY_LONG(float, cbArrayFloat); +WXFL_DEFINE_ARRAY_LONG(float, cbArrayFloat); /* Helper class used internally by the wxFrameLayout class. diff --git a/contrib/include/wx/fl/dyntbar.h b/contrib/include/wx/fl/dyntbar.h index 52945f93ab..25a1593ca6 100644 --- a/contrib/include/wx/fl/dyntbar.h +++ b/contrib/include/wx/fl/dyntbar.h @@ -18,12 +18,13 @@ #include "wx/tbarbase.h" #include "wx/dynarray.h" +#include "wx/fl/fldefs.h" /* Tool layout item. */ -class wxToolLayoutItem : public wxObject +class WXFL_DECLSPEC wxToolLayoutItem : public wxObject { DECLARE_DYNAMIC_CLASS(wxToolLayoutItem) @@ -32,19 +33,19 @@ public: bool mIsSeparator; }; -class wxDynToolInfo; +class WXFL_DECLSPEC wxDynToolInfo; typedef wxToolLayoutItem* wxToolLayoutItemPtrT; typedef wxDynToolInfo* wxDynToolInfoPtrT; -WX_DEFINE_ARRAY( wxToolLayoutItemPtrT, wxLayoutItemArrayT ); -WX_DEFINE_ARRAY( wxDynToolInfoPtrT, wxDynToolInfoArrayT ); +WXFL_DEFINE_ARRAY( wxToolLayoutItemPtrT, wxLayoutItemArrayT ); +WXFL_DEFINE_ARRAY( wxDynToolInfoPtrT, wxDynToolInfoArrayT ); /* This is a base class for layout algorithm implementations. */ -class LayoutManagerBase +class WXFL_DECLSPEC LayoutManagerBase { public: // Constructor. @@ -63,7 +64,7 @@ BagLayout lays out items in left-to-right order from top to bottom. */ -class BagLayout : public LayoutManagerBase +class WXFL_DECLSPEC BagLayout : public LayoutManagerBase { public: // Constructor. @@ -78,7 +79,7 @@ public: This class holds dynamic toolbar item information. */ -class wxDynToolInfo : public wxToolLayoutItem +class WXFL_DECLSPEC wxDynToolInfo : public wxToolLayoutItem { DECLARE_DYNAMIC_CLASS(wxDynToolInfo) @@ -98,7 +99,7 @@ public: wxDynamicToolBar manages containment and layout of tool windows. */ -class wxDynamicToolBar : public wxToolBarBase +class WXFL_DECLSPEC wxDynamicToolBar : public wxToolBarBase { protected: friend class wxDynamicToolBarSerializer; diff --git a/contrib/include/wx/fl/dyntbarhnd.h b/contrib/include/wx/fl/dyntbarhnd.h index 95441c92b8..29446bdeb1 100644 --- a/contrib/include/wx/fl/dyntbarhnd.h +++ b/contrib/include/wx/fl/dyntbarhnd.h @@ -23,7 +23,7 @@ Dynamic toolbar dimension handler. */ -class cbDynToolBarDimHandler : public cbBarDimHandlerBase +class WXFL_DECLSPEC cbDynToolBarDimHandler : public cbBarDimHandlerBase { DECLARE_DYNAMIC_CLASS( cbDynToolBarDimHandler ) public: diff --git a/contrib/include/wx/fl/fldefs.h b/contrib/include/wx/fl/fldefs.h new file mode 100644 index 0000000000..d8346b6229 --- /dev/null +++ b/contrib/include/wx/fl/fldefs.h @@ -0,0 +1,50 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: fldefs.h +// Purpose: Declaration of global types and defines. +// Author: David M. Falkinder (david_falkinder@hp.com) +// Modified by: +// Created: 18/09/2002 +// RCS-ID: $Id$ +// Copyright: (c) David M. Falkinder +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef __fldefs_H_INCLUDED__ +#define __fldefs_H_INCLUDED__ + +#include "wx/defs.h" + +/* + * If we're using wx in Dynamic Library format do we + * want FL to be in DLL form as well? + */ +#if defined(WXUSINGDLL) && \ + (defined(WXMAKING_FL_DLL) || defined(WXUSING_FL_DLL)) + +#if defined(WXMAKING_FL_DLL) + // When building the DLL WXFLDECLSPEC exports classes +# define WXFL_DECLSPEC WXEXPORT +#elif defined(WXUSING_FL_DLL) + // When building the DLL WXFLDECLSPEC imports classes +# define WXFL_DECLSPEC WXIMPORT +#endif // defined(WXBUILD_FL_DLL) + +#else +// When building the static library nullify the effect of WXFL_DECLSPEC +#define WXFL_DECLSPEC +#endif // WXUSINGDLL && (WXMAKING_FL_DLL || WXUSING_FL_DLL) + +/////////////////////////////////////////////////////////////////////////////// +// Override some of the wxArray functions to +// include our definitions +/////////////////////////////////////////////////////////////////////////////// +#define WXFL_DEFINE_ARRAY(c,l) \ + class WXFL_DECLSPEC l; \ + WX_DEFINE_ARRAY(c,l) + +#define WXFL_DEFINE_ARRAY_LONG(t,l) \ + class WXFL_DECLSPEC l; \ + WX_DEFINE_ARRAY_LONG(t,l) + + +#endif // __fldefs_H_INCLUDED__ diff --git a/contrib/include/wx/fl/frmview.h b/contrib/include/wx/fl/frmview.h index 8830ab8e0a..8abc9efa36 100644 --- a/contrib/include/wx/fl/frmview.h +++ b/contrib/include/wx/fl/frmview.h @@ -32,7 +32,7 @@ class wxFrameManager; It is not clear what this class does. It is not used elsewhere in FL. */ -class wxFrameView : public wxEvtHandler +class WXFL_DECLSPEC wxFrameView : public wxEvtHandler { protected: wxStringList mTopMenus; @@ -87,7 +87,7 @@ class wxFrame; It is not clear what this class does. It is not used elsewhere in FL. */ -class wxFrameManager : wxObject +class WXFL_DECLSPEC wxFrameManager : wxObject { protected: wxList mViews; diff --git a/contrib/include/wx/fl/garbagec.h b/contrib/include/wx/fl/garbagec.h index b5f991abfa..652854fc01 100644 --- a/contrib/include/wx/fl/garbagec.h +++ b/contrib/include/wx/fl/garbagec.h @@ -17,6 +17,7 @@ #endif #include "wx/list.h" +#include "wx/fl/fldefs.h" struct GCItem { @@ -33,7 +34,7 @@ inline void* gc_node_to_obj( wxNode* pGCNode ) This class implements an extremely slow but simple garbage collection algorithm. */ -class GarbageCollector +class WXFL_DECLSPEC GarbageCollector { protected: wxList mAllNodes; diff --git a/contrib/include/wx/fl/gcupdatesmgr.h b/contrib/include/wx/fl/gcupdatesmgr.h index 2bfc959f89..4a0310432f 100644 --- a/contrib/include/wx/fl/gcupdatesmgr.h +++ b/contrib/include/wx/fl/gcupdatesmgr.h @@ -93,7 +93,7 @@ to avoid dirty non-client areas of moved windows in some special cases of 'overlapping anomalies'. */ -class cbGCUpdatesMgr : public cbSimpleUpdatesMgr +class WXFL_DECLSPEC cbGCUpdatesMgr : public cbSimpleUpdatesMgr { DECLARE_DYNAMIC_CLASS( cbGCUpdatesMgr ) protected: diff --git a/contrib/include/wx/fl/hintanimpl.h b/contrib/include/wx/fl/hintanimpl.h index e35083386e..1a07c59d6d 100644 --- a/contrib/include/wx/fl/hintanimpl.h +++ b/contrib/include/wx/fl/hintanimpl.h @@ -20,13 +20,13 @@ #include "wx/timer.h" -class cbHintAnimTimer; +class WXFL_DECLSPEC cbHintAnimTimer; /* A plugin to draw animated hints when the user drags a pane. */ -class cbHintAnimationPlugin : public cbPluginBase +class WXFL_DECLSPEC cbHintAnimationPlugin : public cbPluginBase { DECLARE_DYNAMIC_CLASS( cbHintAnimationPlugin ) protected: @@ -101,7 +101,7 @@ public: A private helper class. */ -struct MorphInfoT +struct WXFL_DECLSPEC MorphInfoT { wxPoint mFrom; wxPoint mTill; @@ -111,7 +111,7 @@ struct MorphInfoT A private helper class. */ -class cbHintAnimTimer : public wxTimer +class WXFL_DECLSPEC cbHintAnimTimer : public wxTimer { protected: diff --git a/contrib/include/wx/fl/newbmpbtn.h b/contrib/include/wx/fl/newbmpbtn.h index 73fcc32b59..507880b7ce 100644 --- a/contrib/include/wx/fl/newbmpbtn.h +++ b/contrib/include/wx/fl/newbmpbtn.h @@ -18,6 +18,7 @@ #include "wx/button.h" #include "wx/string.h" +#include "wx/fl/fldefs.h" // defaults #define NB_DEFAULT_MARGIN 2 @@ -31,8 +32,8 @@ // classes declared in this header file -class wxNewBitmapButton; -class wxBorderLessBitmapButton; +class WXFL_DECLSPEC wxNewBitmapButton; +class WXFL_DECLSPEC wxBorderLessBitmapButton; /* This is an alternative class to wxBitmapButton. It is used @@ -194,11 +195,6 @@ public: // Responds to a kill focus event. void OnKillFocus( wxFocusEvent& event ); - // Maps bitmap to current system colours on Windows -#ifdef __WXMSW__ - WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height); -#endif - DECLARE_EVENT_TABLE() }; diff --git a/contrib/include/wx/fl/panedrawpl.h b/contrib/include/wx/fl/panedrawpl.h index 781a9f39bc..e84f318fc6 100644 --- a/contrib/include/wx/fl/panedrawpl.h +++ b/contrib/include/wx/fl/panedrawpl.h @@ -27,7 +27,7 @@ would be enough for the frame layout to function properly (they are plugged in automatically by the wxFrameLayout class). */ -class cbPaneDrawPlugin : public cbPluginBase +class WXFL_DECLSPEC cbPaneDrawPlugin : public cbPluginBase { public: DECLARE_DYNAMIC_CLASS( cbPaneDrawPlugin ) diff --git a/contrib/include/wx/fl/rowdragpl.h b/contrib/include/wx/fl/rowdragpl.h index e9b94aea5b..831a7b7f94 100644 --- a/contrib/include/wx/fl/rowdragpl.h +++ b/contrib/include/wx/fl/rowdragpl.h @@ -25,7 +25,7 @@ The behaviour and appearance resembles drag and drop positioning of the toolbar rows in Netscape Communicator 4.xx. */ -class cbRowDragPlugin : public cbPluginBase +class WXFL_DECLSPEC cbRowDragPlugin : public cbPluginBase { DECLARE_DYNAMIC_CLASS( cbRowDragPlugin ) public: @@ -217,7 +217,7 @@ public: Internal helper class. */ -class cbHiddenBarInfo : public wxObject +class WXFL_DECLSPEC cbHiddenBarInfo : public wxObject { DECLARE_DYNAMIC_CLASS( cbHiddenBarInfo ) public: diff --git a/contrib/include/wx/fl/rowlayoutpl.h b/contrib/include/wx/fl/rowlayoutpl.h index fa1bc52ebf..969140a8a5 100644 --- a/contrib/include/wx/fl/rowlayoutpl.h +++ b/contrib/include/wx/fl/rowlayoutpl.h @@ -23,7 +23,7 @@ Simple implementation of a plugin which handles row layout requests sent from a frame layout. */ -class cbRowLayoutPlugin : public cbPluginBase +class WXFL_DECLSPEC cbRowLayoutPlugin : public cbPluginBase { DECLARE_DYNAMIC_CLASS( cbRowLayoutPlugin ) protected: diff --git a/contrib/include/wx/fl/toolwnd.h b/contrib/include/wx/fl/toolwnd.h index c6509280e6..2024c0c3d0 100644 --- a/contrib/include/wx/fl/toolwnd.h +++ b/contrib/include/wx/fl/toolwnd.h @@ -19,6 +19,7 @@ #include "wx/frame.h" #include "wx/dynarray.h" +#include "wx/fl/fldefs.h" // fixed settings @@ -26,18 +27,18 @@ #define BTN_BOX_WIDTH 12 #define BTN_X_WIEGHT 2 -class cbMiniButton; +class WXFL_DECLSPEC cbMiniButton; typedef cbMiniButton* cbMinitButtonPtrT; -WX_DEFINE_ARRAY( cbMinitButtonPtrT, cbMiniButtonArrayT ); +WXFL_DEFINE_ARRAY( cbMinitButtonPtrT, cbMiniButtonArrayT ); /* A tool window is a special kind of frame that paints its own title, and can be used to implement small floating windows. */ -class wxToolWindow : public wxFrame +class WXFL_DECLSPEC wxToolWindow : public wxFrame { DECLARE_DYNAMIC_CLASS( wxToolWindow ) @@ -221,7 +222,7 @@ public: cbCloseBox is a window close button, used in a wxToolWindow titlebar. */ -class cbCloseBox : public cbMiniButton +class WXFL_DECLSPEC cbCloseBox : public cbMiniButton { public: // Draws the close button appearance. @@ -232,7 +233,7 @@ public: cbCollapseBox is a window collapse button, used in a wxToolWindow titlebar. */ -class cbCollapseBox : public cbMiniButton +class WXFL_DECLSPEC cbCollapseBox : public cbMiniButton { public: bool mIsAtLeft; @@ -245,7 +246,7 @@ public: cbDockBox is a window dock button, used in a wxToolWindow titlebar. */ -class cbDockBox : public cbMiniButton +class WXFL_DECLSPEC cbDockBox : public cbMiniButton { public: // Draws the dock button appearance. @@ -257,7 +258,7 @@ cbFloatedBarWindow is a kind of wxToolWindow, implementing floating toolbars. */ -class cbFloatedBarWindow : public wxToolWindow +class WXFL_DECLSPEC cbFloatedBarWindow : public wxToolWindow { DECLARE_DYNAMIC_CLASS( cbFloatedBarWindow ) protected: diff --git a/contrib/include/wx/fl/updatesmgr.h b/contrib/include/wx/fl/updatesmgr.h index 027d51315b..52a3222b9f 100644 --- a/contrib/include/wx/fl/updatesmgr.h +++ b/contrib/include/wx/fl/updatesmgr.h @@ -23,7 +23,7 @@ This class implements slightly optimized logic for refreshing the areas of frame layout that actually need to be updated. */ -class cbSimpleUpdatesMgr : public cbUpdatesManagerBase +class WXFL_DECLSPEC cbSimpleUpdatesMgr : public cbUpdatesManagerBase { DECLARE_DYNAMIC_CLASS( cbSimpleUpdatesMgr ) protected: diff --git a/contrib/samples/fl/fl_demo1/fl_demo.dsp b/contrib/samples/fl/fl_demo1/fl_demo.dsp index 5b443a2c1b..e0a82d1c6f 100644 --- a/contrib/samples/fl/fl_demo1/fl_demo.dsp +++ b/contrib/samples/fl/fl_demo1/fl_demo.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Application" 0x0101 -CFG=fl_demo1 - Win32 Debug +CFG=fl_demo1 - Win32 Debug DLL !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,14 @@ CFG=fl_demo1 - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "fl_demo.mak" CFG="fl_demo1 - Win32 Debug" +!MESSAGE NMAKE /f "fl_demo.mak" CFG="fl_demo1 - Win32 Debug DLL" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "fl_demo1 - Win32 Release" (based on "Win32 (x86) Application") !MESSAGE "fl_demo1 - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE "fl_demo1 - Win32 Debug DLL" (based on "Win32 (x86) Application") +!MESSAGE "fl_demo1 - Win32 Release DLL" (based on "Win32 (x86) Application") !MESSAGE # Begin Project @@ -81,12 +83,68 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" +!ELSEIF "$(CFG)" == "fl_demo1 - Win32 Debug DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug_DLL" +# PROP BASE Intermediate_Dir "Debug_DLL" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DebugDll" +# PROP Intermediate_Dir "DebugDll" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdlld" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw233d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" + +!ELSEIF "$(CFG)" == "fl_demo1 - Win32 Release DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release_DLL" +# PROP BASE Intermediate_Dir "Release_DLL" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "ReleaseDll" +# PROP Intermediate_Dir "ReleaseDll" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /YX /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw233.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" + !ENDIF # Begin Target # Name "fl_demo1 - Win32 Release" # Name "fl_demo1 - Win32 Debug" +# Name "fl_demo1 - Win32 Debug DLL" +# Name "fl_demo1 - Win32 Release DLL" # Begin Source File SOURCE=.\fl_demo1.cpp @@ -97,6 +155,13 @@ SOURCE=.\fl_demo1.cpp # ADD CPP /Yc"wx/wxprec.h" +!ELSEIF "$(CFG)" == "fl_demo1 - Win32 Debug DLL" + +# ADD BASE CPP /Yc"wx/wxprec.h" +# ADD CPP /Yc"wx/wxprec.h" + +!ELSEIF "$(CFG)" == "fl_demo1 - Win32 Release DLL" + !ENDIF # End Source File diff --git a/contrib/samples/fl/fl_demo1/makefile.vc b/contrib/samples/fl/fl_demo1/makefile.vc index 51eaae55ca..e997c2c79d 100644 --- a/contrib/samples/fl/fl_demo1/makefile.vc +++ b/contrib/samples/fl/fl_demo1/makefile.vc @@ -12,11 +12,25 @@ WXDIR = ..\..\..\.. TARGET = fl_demo1 EXTRAINC = -DBMP_DIR=\"../bitmaps/\" + +!if "$(WXUSING_FL_DLL)" == "1" +# Define WXUSING_FL_DLL so the compiler knows it is set. +EXTRAINC = $(EXTRAINC) -DWXUSING_FL_DLL +# Set to use wxWin in DLL format... +WXUSINGDLL = 1 + +!if "$(FINAL)" == "1" +EXTRALIBS = $(WXDIR)\lib\fldll.lib +!else +EXTRALIBS = $(WXDIR)\lib\fldlld.lib +!endif +!else !if "$(FINAL)" == "1" EXTRALIBS = $(WXDIR)\lib\fl.lib !else EXTRALIBS = $(WXDIR)\lib\fld.lib !endif +!endif PROGRAM = $(TARGET) OBJECTS = $(TARGET).obj diff --git a/contrib/samples/fl/fl_demo2/fl_demo.dsp b/contrib/samples/fl/fl_demo2/fl_demo.dsp index a54daca6c2..16d5aaf91d 100644 --- a/contrib/samples/fl/fl_demo2/fl_demo.dsp +++ b/contrib/samples/fl/fl_demo2/fl_demo.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Application" 0x0101 -CFG=fl_demo2 - Win32 Debug +CFG=fl_demo2 - Win32 Debug DLL !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,14 @@ CFG=fl_demo2 - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "fl_demo.mak" CFG="fl_demo2 - Win32 Debug" +!MESSAGE NMAKE /f "fl_demo.mak" CFG="fl_demo2 - Win32 Debug DLL" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "fl_demo2 - Win32 Release" (based on "Win32 (x86) Application") !MESSAGE "fl_demo2 - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE "fl_demo2 - Win32 Debug DLL" (based on "Win32 (x86) Application") +!MESSAGE "fl_demo2 - Win32 Release DLL" (based on "Win32 (x86) Application") !MESSAGE # Begin Project @@ -81,12 +83,68 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" +!ELSEIF "$(CFG)" == "fl_demo2 - Win32 Debug DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug_DLL" +# PROP BASE Intermediate_Dir "Debug_DLL" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DebugDll" +# PROP Intermediate_Dir "DebugDll" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdlld" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw233d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" + +!ELSEIF "$(CFG)" == "fl_demo2 - Win32 Release DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release_DLL" +# PROP BASE Intermediate_Dir "Release_DLL" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "ReleaseDll" +# PROP Intermediate_Dir "ReleaseDll" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /YX /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw233.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" + !ENDIF # Begin Target # Name "fl_demo2 - Win32 Release" # Name "fl_demo2 - Win32 Debug" +# Name "fl_demo2 - Win32 Debug DLL" +# Name "fl_demo2 - Win32 Release DLL" # Begin Source File SOURCE=.\fl_demo2.cpp @@ -97,6 +155,13 @@ SOURCE=.\fl_demo2.cpp # ADD CPP /Yc"wx/wxprec.h" +!ELSEIF "$(CFG)" == "fl_demo2 - Win32 Debug DLL" + +# ADD BASE CPP /Yc"wx/wxprec.h" +# ADD CPP /Yc"wx/wxprec.h" + +!ELSEIF "$(CFG)" == "fl_demo2 - Win32 Release DLL" + !ENDIF # End Source File diff --git a/contrib/samples/fl/fl_demo2/makefile.vc b/contrib/samples/fl/fl_demo2/makefile.vc index e05c0d699c..f3414ac254 100644 --- a/contrib/samples/fl/fl_demo2/makefile.vc +++ b/contrib/samples/fl/fl_demo2/makefile.vc @@ -12,11 +12,25 @@ WXDIR = ..\..\..\.. TARGET = fl_demo2 EXTRAINC = -DBMP_DIR=\"../bitmaps/\" + +!if "$(WXUSING_FL_DLL)" == "1" +# Define WXUSING_FL_DLL so the compiler knows it is set. +EXTRAINC = $(EXTRAINC) -DWXUSING_FL_DLL +# Set to use wxWin in DLL format... +WXUSINGDLL = 1 + +!if "$(FINAL)" == "1" +EXTRALIBS = $(WXDIR)\lib\fldll.lib +!else +EXTRALIBS = $(WXDIR)\lib\fldlld.lib +!endif +!else !if "$(FINAL)" == "1" EXTRALIBS = $(WXDIR)\lib\fl.lib !else EXTRALIBS = $(WXDIR)\lib\fld.lib !endif +!endif PROGRAM = $(TARGET) OBJECTS = $(TARGET).obj diff --git a/contrib/samples/fl/fl_sample1/fl_demo.dsp b/contrib/samples/fl/fl_sample1/fl_demo.dsp index 7f32ffaab0..660a3c107c 100644 --- a/contrib/samples/fl/fl_sample1/fl_demo.dsp +++ b/contrib/samples/fl/fl_sample1/fl_demo.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Application" 0x0101 -CFG=fl_sample1 - Win32 Debug +CFG=fl_sample1 - Win32 Debug DLL !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,14 @@ CFG=fl_sample1 - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "fl_demo.mak" CFG="fl_sample1 - Win32 Debug" +!MESSAGE NMAKE /f "fl_demo.mak" CFG="fl_sample1 - Win32 Debug DLL" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "fl_sample1 - Win32 Release" (based on "Win32 (x86) Application") !MESSAGE "fl_sample1 - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE "fl_sample1 - Win32 Debug DLL" (based on "Win32 (x86) Application") +!MESSAGE "fl_sample1 - Win32 Release DLL" (based on "Win32 (x86) Application") !MESSAGE # Begin Project @@ -81,12 +83,68 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" +!ELSEIF "$(CFG)" == "fl_sample1 - Win32 Debug DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug_DLL" +# PROP BASE Intermediate_Dir "Debug_DLL" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DebugDll" +# PROP Intermediate_Dir "DebugDll" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdlld" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw233d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" + +!ELSEIF "$(CFG)" == "fl_sample1 - Win32 Release DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release_DLL" +# PROP BASE Intermediate_Dir "Release_DLL" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "ReleaseDll" +# PROP Intermediate_Dir "ReleaseDll" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /YX /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw233.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" + !ENDIF # Begin Target # Name "fl_sample1 - Win32 Release" # Name "fl_sample1 - Win32 Debug" +# Name "fl_sample1 - Win32 Debug DLL" +# Name "fl_sample1 - Win32 Release DLL" # Begin Source File SOURCE=.\fl_sample1.cpp @@ -97,6 +155,13 @@ SOURCE=.\fl_sample1.cpp # ADD CPP /Yc"wx/wxprec.h" +!ELSEIF "$(CFG)" == "fl_sample1 - Win32 Debug DLL" + +# ADD BASE CPP /Yc"wx/wxprec.h" +# ADD CPP /Yc"wx/wxprec.h" + +!ELSEIF "$(CFG)" == "fl_sample1 - Win32 Release DLL" + !ENDIF # End Source File diff --git a/contrib/samples/fl/fl_sample1/makefile.vc b/contrib/samples/fl/fl_sample1/makefile.vc index 50f4d6e26b..fed37595d7 100644 --- a/contrib/samples/fl/fl_sample1/makefile.vc +++ b/contrib/samples/fl/fl_sample1/makefile.vc @@ -12,11 +12,25 @@ WXDIR = ..\..\..\.. TARGET = fl_sample1 EXTRAINC = -DBMP_DIR=\"../bitmaps/\" + +!if "$(WXUSING_FL_DLL)" == "1" +# Define WXUSING_FL_DLL so the compiler knows it is set. +EXTRAINC = $(EXTRAINC) -DWXUSING_FL_DLL +# Set to use wxWin in DLL format... +WXUSINGDLL = 1 + +!if "$(FINAL)" == "1" +EXTRALIBS = $(WXDIR)\lib\fldll.lib +!else +EXTRALIBS = $(WXDIR)\lib\fldlld.lib +!endif +!else !if "$(FINAL)" == "1" EXTRALIBS = $(WXDIR)\lib\fl.lib !else EXTRALIBS = $(WXDIR)\lib\fld.lib !endif +!endif PROGRAM = $(TARGET) OBJECTS = $(TARGET).obj diff --git a/contrib/samples/fl/fl_sample2/fl_demo.dsp b/contrib/samples/fl/fl_sample2/fl_demo.dsp index b1c478514e..07386b3d13 100644 --- a/contrib/samples/fl/fl_sample2/fl_demo.dsp +++ b/contrib/samples/fl/fl_sample2/fl_demo.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Application" 0x0101 -CFG=fl_sample2 - Win32 Debug +CFG=fl_sample2 - Win32 Debug DLL !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,14 @@ CFG=fl_sample2 - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "fl_demo.mak" CFG="fl_sample2 - Win32 Debug" +!MESSAGE NMAKE /f "fl_demo.mak" CFG="fl_sample2 - Win32 Debug DLL" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "fl_sample2 - Win32 Release" (based on "Win32 (x86) Application") !MESSAGE "fl_sample2 - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE "fl_sample2 - Win32 Debug DLL" (based on "Win32 (x86) Application") +!MESSAGE "fl_sample2 - Win32 Release DLL" (based on "Win32 (x86) Application") !MESSAGE # Begin Project @@ -81,12 +83,68 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" +!ELSEIF "$(CFG)" == "fl_sample2 - Win32 Debug DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug_DLL" +# PROP BASE Intermediate_Dir "Debug_DLL" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DebugDll" +# PROP Intermediate_Dir "DebugDll" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdlld" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw233d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" + +!ELSEIF "$(CFG)" == "fl_sample2 - Win32 Release DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release_DLL" +# PROP BASE Intermediate_Dir "Release_DLL" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "ReleaseDll" +# PROP Intermediate_Dir "ReleaseDll" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /YX /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw233.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" + !ENDIF # Begin Target # Name "fl_sample2 - Win32 Release" # Name "fl_sample2 - Win32 Debug" +# Name "fl_sample2 - Win32 Debug DLL" +# Name "fl_sample2 - Win32 Release DLL" # Begin Source File SOURCE=.\fl_sample2.cpp @@ -97,6 +155,13 @@ SOURCE=.\fl_sample2.cpp # ADD CPP /Yc"wx/wxprec.h" +!ELSEIF "$(CFG)" == "fl_sample2 - Win32 Debug DLL" + +# ADD BASE CPP /Yc"wx/wxprec.h" +# ADD CPP /Yc"wx/wxprec.h" + +!ELSEIF "$(CFG)" == "fl_sample2 - Win32 Release DLL" + !ENDIF # End Source File diff --git a/contrib/samples/fl/fl_sample2/makefile.vc b/contrib/samples/fl/fl_sample2/makefile.vc index dabd5660e5..22340ab393 100644 --- a/contrib/samples/fl/fl_sample2/makefile.vc +++ b/contrib/samples/fl/fl_sample2/makefile.vc @@ -12,11 +12,25 @@ WXDIR = ..\..\..\.. TARGET = fl_sample2 EXTRAINC = -DBMP_DIR=\"../bitmaps/\" + +!if "$(WXUSING_FL_DLL)" == "1" +# Define WXUSING_FL_DLL so the compiler knows it is set. +EXTRAINC = $(EXTRAINC) -DWXUSING_FL_DLL +# Set to use wxWin in DLL format... +WXUSINGDLL = 1 + +!if "$(FINAL)" == "1" +EXTRALIBS = $(WXDIR)\lib\fldll.lib +!else +EXTRALIBS = $(WXDIR)\lib\fldlld.lib +!endif +!else !if "$(FINAL)" == "1" EXTRALIBS = $(WXDIR)\lib\fl.lib !else EXTRALIBS = $(WXDIR)\lib\fld.lib !endif +!endif PROGRAM = $(TARGET) OBJECTS = $(TARGET).obj diff --git a/contrib/samples/fl/fl_sample3/fl_demo.dsp b/contrib/samples/fl/fl_sample3/fl_demo.dsp index 83830eb9db..02365ab5d7 100644 --- a/contrib/samples/fl/fl_sample3/fl_demo.dsp +++ b/contrib/samples/fl/fl_sample3/fl_demo.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Application" 0x0101 -CFG=fl_sample3 - Win32 Debug +CFG=fl_sample3 - Win32 Debug DLL !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,14 @@ CFG=fl_sample3 - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "fl_demo.mak" CFG="fl_sample3 - Win32 Debug" +!MESSAGE NMAKE /f "fl_demo.mak" CFG="fl_sample3 - Win32 Debug DLL" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "fl_sample3 - Win32 Release" (based on "Win32 (x86) Application") !MESSAGE "fl_sample3 - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE "fl_sample3 - Win32 Debug DLL" (based on "Win32 (x86) Application") +!MESSAGE "fl_sample3 - Win32 Release DLL" (based on "Win32 (x86) Application") !MESSAGE # Begin Project @@ -81,12 +83,68 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" +!ELSEIF "$(CFG)" == "fl_sample3 - Win32 Debug DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug_DLL" +# PROP BASE Intermediate_Dir "Debug_DLL" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DebugDll" +# PROP Intermediate_Dir "DebugDll" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdlld" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw233d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" + +!ELSEIF "$(CFG)" == "fl_sample3 - Win32 Release DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release_DLL" +# PROP BASE Intermediate_Dir "Release_DLL" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "ReleaseDll" +# PROP Intermediate_Dir "ReleaseDll" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /YX /FD /D BMP_DIR=\"../bitmaps/\" /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw233.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" + !ENDIF # Begin Target # Name "fl_sample3 - Win32 Release" # Name "fl_sample3 - Win32 Debug" +# Name "fl_sample3 - Win32 Debug DLL" +# Name "fl_sample3 - Win32 Release DLL" # Begin Source File SOURCE=.\fl_sample3.cpp @@ -97,6 +155,13 @@ SOURCE=.\fl_sample3.cpp # ADD CPP /Yc"wx/wxprec.h" +!ELSEIF "$(CFG)" == "fl_sample3 - Win32 Debug DLL" + +# ADD BASE CPP /Yc"wx/wxprec.h" +# ADD CPP /Yc"wx/wxprec.h" + +!ELSEIF "$(CFG)" == "fl_sample3 - Win32 Release DLL" + !ENDIF # End Source File diff --git a/contrib/samples/fl/fl_sample3/makefile.vc b/contrib/samples/fl/fl_sample3/makefile.vc index 699a66babc..d63277a77a 100644 --- a/contrib/samples/fl/fl_sample3/makefile.vc +++ b/contrib/samples/fl/fl_sample3/makefile.vc @@ -12,11 +12,25 @@ WXDIR = ..\..\..\.. TARGET = fl_sample3 EXTRAINC = -DBMP_DIR=\"../bitmaps/\" + +!if "$(WXUSING_FL_DLL)" == "1" +# Define WXUSING_FL_DLL so the compiler knows it is set. +EXTRAINC = $(EXTRAINC) -DWXUSING_FL_DLL +# Set to use wxWin in DLL format... +WXUSINGDLL = 1 + +!if "$(FINAL)" == "1" +EXTRALIBS = $(WXDIR)\lib\fldll.lib +!else +EXTRALIBS = $(WXDIR)\lib\fldlld.lib +!endif +!else !if "$(FINAL)" == "1" EXTRALIBS = $(WXDIR)\lib\fl.lib !else EXTRALIBS = $(WXDIR)\lib\fld.lib !endif +!endif PROGRAM = $(TARGET) OBJECTS = $(TARGET).obj diff --git a/contrib/src/fl/flVC.dsp b/contrib/src/fl/flVC.dsp index 0d1adf1f93..ec5361b02b 100644 --- a/contrib/src/fl/flVC.dsp +++ b/contrib/src/fl/flVC.dsp @@ -2,9 +2,10 @@ # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=flVC - Win32 Debug +CFG=flVC - Win32 Release DLL !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,20 +14,20 @@ CFG=flVC - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "flVC.mak" CFG="flVC - Win32 Debug" +!MESSAGE NMAKE /f "flVC.mak" CFG="flVC - Win32 Release DLL" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "flVC - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "flVC - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "flVC - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "flVC - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe !IF "$(CFG)" == "flVC - Win32 Release" @@ -40,9 +41,11 @@ RSC=rc.exe # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" # PROP Target_Dir "" +LINK32=link.exe +CPP=cl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/msw" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__HACK_MY_MSDEV40__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/msw" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__HACK_MY_MSDEV40__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c +RSC=rc.exe # ADD BASE RSC /l 0x809 # ADD RSC /l 0x809 BSC32=bscmake.exe @@ -64,9 +67,11 @@ LIB32=link.exe -lib # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" +LINK32=link.exe +CPP=cl.exe # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c +RSC=rc.exe # ADD BASE RSC /l 0x809 # ADD RSC /l 0x809 BSC32=bscmake.exe @@ -76,12 +81,82 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\..\..\lib\fld.lib" +!ELSEIF "$(CFG)" == "flVC - Win32 Debug DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug_DLL" +# PROP BASE Intermediate_Dir "Debug_DLL" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\..\lib" +# PROP Intermediate_Dir "Debug_DLL" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\..\lib\fld.lib" +# ADD LIB32 /nologo /out:"..\..\..\lib\fld.lib" +CPP=cl.exe +# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_FL_DLL" /YX /FD /c +# SUBTRACT CPP /u +MTL=midl.exe +RSC=rc.exe +# ADD BASE RSC /l 0x809 +# ADD RSC /l 0x809 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 /machine:IX86 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw233d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/fldlld.dll" /libpath:"../../../lib" +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "flVC - Win32 Release DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "flVC___Win32_Release_DLL" +# PROP BASE Intermediate_Dir "flVC___Win32_Release_DLL" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\..\lib" +# PROP Intermediate_Dir "Release_DLL" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\..\lib\fld.lib" +# ADD LIB32 /nologo /out:"..\..\..\lib\fld.lib" +CPP=cl.exe +# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /D "WXBUILD_FL_DLL" /YX /FD /c +# SUBTRACT BASE CPP /u +# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_FL_DLL" /YX /FD /c +# SUBTRACT CPP /u +MTL=midl.exe +RSC=rc.exe +# ADD BASE RSC /l 0x809 +# ADD RSC /l 0x809 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw233d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/fldlld.dll" /libpath:"../../../lib" +# SUBTRACT BASE LINK32 /pdb:none +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw233.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/fldll.dll" /libpath:"../../../lib" +# SUBTRACT LINK32 /pdb:none /incremental:no /debug + !ENDIF # Begin Target # Name "flVC - Win32 Release" # Name "flVC - Win32 Debug" +# Name "flVC - Win32 Debug DLL" +# Name "flVC - Win32 Release DLL" # Begin Group "Headers" # PROP Default_Filter "" @@ -119,6 +194,10 @@ SOURCE=..\..\include\wx\fl\dyntbarhnd.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\fl\fldefs.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\fl\frmview.h # End Source File # Begin Source File diff --git a/contrib/src/fl/newbmpbtn.cpp b/contrib/src/fl/newbmpbtn.cpp index 740bf206d8..0659bea4ac 100644 --- a/contrib/src/fl/newbmpbtn.cpp +++ b/contrib/src/fl/newbmpbtn.cpp @@ -525,7 +525,7 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp, #ifdef __WXMSW__ // Map to system colours - (void) MapBitmap(destBmp->GetHBITMAP(), destBmp->GetWidth(), destBmp->GetHeight()); + (void) wxToolBar::MapBitmap(destBmp->GetHBITMAP(), destBmp->GetWidth(), destBmp->GetHeight()); #endif } @@ -799,49 +799,3 @@ void wxNewBitmapButton::OnKillFocus( wxFocusEvent& event ) wxMessageBox("kill-focus for button!"); } -#ifdef __WXMSW__ -WXHBITMAP wxNewBitmapButton::MapBitmap(WXHBITMAP bitmap, int width, int height) -{ - MemoryHDC hdcMem; - - if ( !hdcMem ) - { - wxLogLastError(_T("CreateCompatibleDC")); - - return bitmap; - } - - SelectInHDC bmpInHDC(hdcMem, (HBITMAP)bitmap); - - if ( !bmpInHDC ) - { - wxLogLastError(_T("SelectObject")); - - return bitmap; - } - - wxCOLORMAP *cmap = wxGetStdColourMap(); - - for ( int i = 0; i < width; i++ ) - { - for ( int j = 0; j < height; j++ ) - { - COLORREF pixel = ::GetPixel(hdcMem, i, j); - - for ( size_t k = 0; k < wxSTD_COL_MAX; k++ ) - { - COLORREF col = cmap[k].from; - if ( abs(GetRValue(pixel) - GetRValue(col)) < 10 && - abs(GetGValue(pixel) - GetGValue(col)) < 10 && - abs(GetBValue(pixel) - GetBValue(col)) < 10 ) - { - ::SetPixel(hdcMem, i, j, cmap[k].to); - break; - } - } - } - } - - return bitmap; -} -#endif