Fixed mouse handling for captured windows

[wxWidgets.git] / src / msw / makefile.b32

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 094457d0f7a59e922666c74898379493dfcf52ad..901fc4bb5e383ea077379c8eab0594203901d4b4 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -15,9 +15,7 @@
 # Makefile : Builds wxWindows library wx.lib for MS Windows,
 # and Borland C++ (32-bit).
 
 # Makefile : Builds wxWindows library wx.lib for MS Windows,
 # and Borland C++ (32-bit).
 

-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
+# BCCDIR now defined in ../makeb32.env

 
 !if "$(WXWIN)" == ""
 !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
 
 !if "$(WXWIN)" == ""
 !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx


@@ -213,6 +211,7 @@ COMMONOBJS = \
                $(MSWDIR)\sckfile.obj \
                $(MSWDIR)\sckipc.obj \
                $(MSWDIR)\sckstrm.obj \
                $(MSWDIR)\sckfile.obj \
                $(MSWDIR)\sckipc.obj \
                $(MSWDIR)\sckstrm.obj \

+               $(MSWDIR)\settcmn.obj \

                $(MSWDIR)\sizer.obj \
                $(MSWDIR)\socket.obj \
                $(MSWDIR)\statbar.obj \
                $(MSWDIR)\sizer.obj \
                $(MSWDIR)\socket.obj \
                $(MSWDIR)\statbar.obj \


@@ -299,6 +298,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\helpwin.obj \
                $(MSWDIR)\icon.obj \
                $(MSWDIR)\imaglist.obj \
                $(MSWDIR)\helpwin.obj \
                $(MSWDIR)\icon.obj \
                $(MSWDIR)\imaglist.obj \

+               $(MSWDIR)\iniconf.obj \

                $(MSWDIR)\joystick.obj \
                $(MSWDIR)\listbox.obj \
                $(MSWDIR)\listctrl.obj \
                $(MSWDIR)\joystick.obj \
                $(MSWDIR)\listbox.obj \
                $(MSWDIR)\listctrl.obj \


@@ -318,6 +318,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\palette.obj \
                $(MSWDIR)\pen.obj \
                $(MSWDIR)\penwin.obj \
                $(MSWDIR)\palette.obj \
                $(MSWDIR)\pen.obj \
                $(MSWDIR)\penwin.obj \

+               $(MSWDIR)\popupwin.obj \

                $(MSWDIR)\printdlg.obj \
                $(MSWDIR)\printwin.obj \
                $(MSWDIR)\radiobox.obj \
                $(MSWDIR)\printdlg.obj \
                $(MSWDIR)\printwin.obj \
                $(MSWDIR)\radiobox.obj \


@@ -379,15 +380,24 @@ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 default:       wx
 
 
 default:       wx
 

-wx:    setuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+wx:    $(ARCHINCDIR)\wx makesetuph makearchsetuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+
+all:   wx

 
 

-# TODO: put the setup.h under lib
-setuph:
+# Copy the in-CVS setup0.h to setup.h if necessary
+makesetuph:

      cd $(WXDIR)\include\wx\msw
      if not exist setup.h copy setup0.h setup.h
      cd $(WXDIR)\src\msw
 
      cd $(WXDIR)\include\wx\msw
      if not exist setup.h copy setup0.h setup.h
      cd $(WXDIR)\src\msw
 

-all:   wx
+# Copy include\wx\msw\setup.h to the architecture-specific location
+makearchsetuph:
+     copy $(WXDIR)\include\wx\msw\setup.h $(ARCHSETUPH)
+     cd $(WXDIR)\src\msw
+
+$(ARCHINCDIR)\wx:
+    -mkdir $(ARCHINCDIR)
+    -mkdir $(ARCHINCDIR)\wx

 
 !if "$(DLL)" == "0"
 
 
 !if "$(DLL)" == "0"
 


@@ -542,6 +552,8 @@ $(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
 
 $(MSWDIR)\imaglist.obj: $(MSWDIR)\imaglist.$(SRCSUFF)
 
 
 $(MSWDIR)\imaglist.obj: $(MSWDIR)\imaglist.$(SRCSUFF)
 

+$(MSWDIR)\iniconf.obj: $(MSWDIR)\iniconf.$(SRCSUFF)
+

 $(MSWDIR)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF)
 
 $(MSWDIR)\listbox.obj: $(MSWDIR)\listbox.$(SRCSUFF)
 $(MSWDIR)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF)
 
 $(MSWDIR)\listbox.obj: $(MSWDIR)\listbox.$(SRCSUFF)


@@ -580,6 +592,8 @@ $(MSWDIR)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF)
 
 $(MSWDIR)\penwin.obj: $(MSWDIR)\penwin.$(SRCSUFF)
 
 
 $(MSWDIR)\penwin.obj: $(MSWDIR)\penwin.$(SRCSUFF)
 

+$(MSWDIR)\popupwin.obj: $(MSWDIR)\popupwin.$(SRCSUFF)
+

 $(MSWDIR)\printdlg.obj: $(MSWDIR)\printdlg.$(SRCSUFF)
 
 $(MSWDIR)\printwin.obj: $(MSWDIR)\printwin.$(SRCSUFF)
 $(MSWDIR)\printdlg.obj: $(MSWDIR)\printdlg.$(SRCSUFF)
 
 $(MSWDIR)\printwin.obj: $(MSWDIR)\printwin.$(SRCSUFF)


@@ -849,6 +863,8 @@ $(MSWDIR)\sckipc.obj: $(COMMDIR)\sckipc.$(SRCSUFF)
 
 $(MSWDIR)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF)
 
 
 $(MSWDIR)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF)
 

+$(MSWDIR)\settcmn.obj: $(COMMDIR)\settcmn.$(SRCSUFF)
+

 $(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF)
 
 $(MSWDIR)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF)
 $(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF)
 
 $(MSWDIR)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF)


@@ -1106,7 +1122,7 @@ $(CFG): makefile.b32
 -w-hid # virtual function A hides virtual function B
 -tWM
 
 -w-hid # virtual function A hides virtual function B
 -tWM
 

--I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff
+-I$(ARCHINCDIR);$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff

 -I$(WXDIR)\include\wx\msw\gnuwin32
 
 -L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
 -I$(WXDIR)\include\wx\msw\gnuwin32
 
 -L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk