added CreateDDB() and CreatePalette()

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

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index b95bd786242129f8b6b87793ff84b83ec113163d..1be7587c1a5afaec94bb053587e95f9a2d1841af 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -21,17 +21,19 @@ include $(WXDIR)/src/makeg95.env
 
 # DLL Name, if building wxWindows as a DLL.
 ifdef WXMAKINGDLL
 
 # DLL Name, if building wxWindows as a DLL.
 ifdef WXMAKINGDLL

-WXDLL = $(WXDIR)/lib/wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).dll
+WXDLL = $(WXDIR)/lib/wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT)$(MIN_SUFFIX).dll

 WXDEF = wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).def
 WXDEF = wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).def

-DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
-                 $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \
-                    $(WXDIR)/lib/libtiff.a $(WXDIR)/lib/libregex.a
+DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib$(MIN_SUFFIX).a \
+                 $(WXDIR)/lib/libpng$(MIN_SUFFIX).a \
+                 $(WXDIR)/lib/libjpeg$(MIN_SUFFIX).a \
+                 $(WXDIR)/lib/libtiff$(MIN_SUFFIX).a \
+                 $(WXDIR)/lib/libregex$(MIN_SUFFIX).a

 DLL_LDFLAGS = -L$(WXDIR)/lib
 DLL_BASE_LDLIBS = $(DLL_EXTRA_LIBS) -lstdc++ -lwsock32
 ifeq ($(wxUSE_GUI),0)
   DLL_LDLIBS = $(DLL_BASE_LDLIBS)
 else
 DLL_LDFLAGS = -L$(WXDIR)/lib
 DLL_BASE_LDLIBS = $(DLL_EXTRA_LIBS) -lstdc++ -lwsock32
 ifeq ($(wxUSE_GUI),0)
   DLL_LDLIBS = $(DLL_BASE_LDLIBS)
 else

-  DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
+  DLL_LDLIBS = -lcomctl32 -lctl3d32 -lole32 -loleaut32 \

               -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
                $(DLL_BASE_LDLIBS)
 endif
               -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
                $(DLL_BASE_LDLIBS)
 endif


@@ -52,25 +54,22 @@ OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw
 REGEXDIR= $(WXDIR)/src/regex
 
 MSWDIR  = $(WXDIR)/src/msw
 REGEXDIR= $(WXDIR)/src/regex
 

-ZLIBLIB = $(WXDIR)/lib/libzlib.a
-PNGLIB  = $(WXDIR)/lib/libpng.a
-JPEGLIB = $(WXDIR)/lib/libjpeg.a
-TIFFLIB = $(WXDIR)/lib/libtiff.a
-REGEXLIB= $(WXDIR)/lib/libregex.a
+ZLIBLIB = $(WXDIR)/lib/libzlib$(MIN_SUFFIX).a
+PNGLIB  = $(WXDIR)/lib/libpng$(MIN_SUFFIX).a
+JPEGLIB = $(WXDIR)/lib/libjpeg$(MIN_SUFFIX).a
+TIFFLIB = $(WXDIR)/lib/libtiff$(MIN_SUFFIX).a
+REGEXLIB= $(WXDIR)/lib/libregex$(MIN_SUFFIX).a

 
 DOCDIR = $(WXDIR)/docs
 
 # Only use the WIN32 wxDirDialog if we have a recent
 # version of Mingw32
 
 DOCDIR = $(WXDIR)/docs
 
 # Only use the WIN32 wxDirDialog if we have a recent
 # version of Mingw32

-ifeq ($(MINGW32),1)
-  ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
+ifeq "$(strip $(RECENT_MINGW))" "yes"

                DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF)
                DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF)

-  else
-               DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
-  endif

 else
                DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
 endif
 else
                DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
 endif

+

 ifeq ($(wxUSE_GUI),0)
   DIRDLGOBJ =
 endif
 ifeq ($(wxUSE_GUI),0)
   DIRDLGOBJ =
 endif


@@ -149,6 +148,7 @@ COMMONOBJS_BASE  = \
                $(COMMDIR)/memory.$(OBJSUFF) \
                $(COMMDIR)/mimecmn.$(OBJSUFF) \
                $(COMMDIR)/module.$(OBJSUFF) \
                $(COMMDIR)/memory.$(OBJSUFF) \
                $(COMMDIR)/mimecmn.$(OBJSUFF) \
                $(COMMDIR)/module.$(OBJSUFF) \

+               $(COMMDIR)/msgout.$(OBJSUFF) \

                $(COMMDIR)/mstream.$(OBJSUFF) \
                $(COMMDIR)/object.$(OBJSUFF) \
                $(COMMDIR)/process.$(OBJSUFF) \
                $(COMMDIR)/mstream.$(OBJSUFF) \
                $(COMMDIR)/object.$(OBJSUFF) \
                $(COMMDIR)/process.$(OBJSUFF) \


@@ -183,6 +183,7 @@ COMMONOBJS_BASEONLY  = \
 COMMONOBJS  = \
                 $(COMMONOBJS_BASE) \
                $(COMMDIR)/y_tab.$(OBJSUFF) \
 COMMONOBJS  = \
                 $(COMMONOBJS_BASE) \
                $(COMMDIR)/y_tab.$(OBJSUFF) \

+               $(COMMDIR)/accesscmn.$(OBJSUFF) \

                $(COMMDIR)/artprov.$(OBJSUFF) \
                $(COMMDIR)/artstd.$(OBJSUFF) \
                $(COMMDIR)/choiccmn.$(OBJSUFF) \
                $(COMMDIR)/artprov.$(OBJSUFF) \
                $(COMMDIR)/artstd.$(OBJSUFF) \
                $(COMMDIR)/choiccmn.$(OBJSUFF) \


@@ -200,6 +201,7 @@ COMMONOBJS  = \
                $(COMMDIR)/dobjcmn.$(OBJSUFF) \
                $(COMMDIR)/docmdi.$(OBJSUFF) \
                $(COMMDIR)/docview.$(OBJSUFF) \
                $(COMMDIR)/dobjcmn.$(OBJSUFF) \
                $(COMMDIR)/docmdi.$(OBJSUFF) \
                $(COMMDIR)/docview.$(OBJSUFF) \

+               $(COMMDIR)/dpycmn.$(OBJSUFF) \

                $(COMMDIR)/dseldlg.$(OBJSUFF) \
                $(COMMDIR)/effects.$(OBJSUFF) \
                $(COMMDIR)/fddlgcmn.$(OBJSUFF) \
                $(COMMDIR)/dseldlg.$(OBJSUFF) \
                $(COMMDIR)/effects.$(OBJSUFF) \
                $(COMMDIR)/fddlgcmn.$(OBJSUFF) \


@@ -265,7 +267,6 @@ HTMLOBJS = \
                $(HTMLDIR)/m_layout.$(OBJSUFF) \
                $(HTMLDIR)/m_links.$(OBJSUFF) \
                $(HTMLDIR)/m_list.$(OBJSUFF) \
                $(HTMLDIR)/m_layout.$(OBJSUFF) \
                $(HTMLDIR)/m_links.$(OBJSUFF) \
                $(HTMLDIR)/m_list.$(OBJSUFF) \

-               $(HTMLDIR)/m_meta.$(OBJSUFF) \

                $(HTMLDIR)/m_pre.$(OBJSUFF) \
                $(HTMLDIR)/m_style.$(OBJSUFF) \
                $(HTMLDIR)/m_tables.$(OBJSUFF) \
                $(HTMLDIR)/m_pre.$(OBJSUFF) \
                $(HTMLDIR)/m_style.$(OBJSUFF) \
                $(HTMLDIR)/m_tables.$(OBJSUFF) \


@@ -314,7 +315,7 @@ MSWOBJS     = \
                $(MSWDIR)/dialog.$(OBJSUFF) \
                $(MSWDIR)/dialup.$(OBJSUFF) \
                $(MSWDIR)/dib.$(OBJSUFF) \
                $(MSWDIR)/dialog.$(OBJSUFF) \
                $(MSWDIR)/dialup.$(OBJSUFF) \
                $(MSWDIR)/dib.$(OBJSUFF) \

-               $(MSWDIR)/dibutils.$(OBJSUFF) \
+               $(MSWDIR)/display.$(OBJSUFF) \

                $(MSWDIR)/dragimag.$(OBJSUFF) \
                $(MSWDIR)/enhmeta.$(OBJSUFF) \
                $(MSWDIR)/evtloop.$(OBJSUFF) \
                $(MSWDIR)/dragimag.$(OBJSUFF) \
                $(MSWDIR)/enhmeta.$(OBJSUFF) \
                $(MSWDIR)/evtloop.$(OBJSUFF) \


@@ -351,6 +352,7 @@ MSWOBJS     = \
                $(MSWDIR)/palette.$(OBJSUFF) \
                $(MSWDIR)/pen.$(OBJSUFF) \
                $(MSWDIR)/penwin.$(OBJSUFF) \
                $(MSWDIR)/palette.$(OBJSUFF) \
                $(MSWDIR)/pen.$(OBJSUFF) \
                $(MSWDIR)/penwin.$(OBJSUFF) \

+               $(MSWDIR)/popupwin.$(OBJSUFF) \

                $(MSWDIR)/printdlg.$(OBJSUFF) \
                $(MSWDIR)/printwin.$(OBJSUFF) \
                $(MSWDIR)/radiobox.$(OBJSUFF) \
                $(MSWDIR)/printdlg.$(OBJSUFF) \
                $(MSWDIR)/printwin.$(OBJSUFF) \
                $(MSWDIR)/radiobox.$(OBJSUFF) \


@@ -383,6 +385,7 @@ ADVANCEDOBJS_BASE = \
 ADVANCEDOBJS     = \
                 $(ADVANCEDOBJS_BASE) \
                $(COMMDIR)/odbc.$(OBJSUFF) \
 ADVANCEDOBJS     = \
                 $(ADVANCEDOBJS_BASE) \
                $(COMMDIR)/odbc.$(OBJSUFF) \

+               $(MSWDIR)/ole/access.$(OBJSUFF) \

                $(MSWDIR)/ole/automtn.$(OBJSUFF) \
                $(MSWDIR)/ole/dataobj.$(OBJSUFF) \
                $(MSWDIR)/ole/dropsrc.$(OBJSUFF) \
                $(MSWDIR)/ole/automtn.$(OBJSUFF) \
                $(MSWDIR)/ole/dataobj.$(OBJSUFF) \
                $(MSWDIR)/ole/dropsrc.$(OBJSUFF) \


@@ -506,12 +509,8 @@ TIFFOBJS = $(TIFFDIR)/tif_aux.o \
                $(TIFFDIR)/tif_write.o \
                $(TIFFDIR)/tif_zip.o
 
                $(TIFFDIR)/tif_write.o \
                $(TIFFDIR)/tif_zip.o
 

-ifeq ($(MINGW32),1)
-  ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
-  else
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
-  endif
+ifeq "$(strip $(RECENT_MINGW))" "yes"
+  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)

 else
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 else
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif


@@ -519,20 +518,12 @@ ifeq ($(wxUSE_GUI),0)
   OBJECTS = $(MSWOBJS_BASE) $(COMMONOBJS_BASE) $(COMMONOBJS_BASEONLY) $(GENERICOBJS_BASE)
 endif
 
   OBJECTS = $(MSWOBJS_BASE) $(COMMONOBJS_BASE) $(COMMONOBJS_BASEONLY) $(GENERICOBJS_BASE)
 endif
 

-# MBN: if anyone has a better solution for this kludge, step
-#      forward, *please*
-# this tests is we are on cygwin or not ( will _not_ work if you are using
-# ZSH on plain Win32, tought ); it uses the presence of "/"
-# in the PATH variable
-

 # how do you do "VAR=\" ? BLEAGH!
 BACKSLASH=$(subst a,\,a)
 # how do you do "VAR=\" ? BLEAGH!
 BACKSLASH=$(subst a,\,a)

-ifeq (,$(findstring /,$(PATH)))
-  IS_CYGWIN=0
+ifeq (,$(findstring $(OSTYPE),"cygwin!msys"))

   PATH_SEPARATOR:=$(BACKSLASH)
   PATH_SUBST=/
 else
   PATH_SEPARATOR:=$(BACKSLASH)
   PATH_SUBST=/
 else

-  IS_CYGWIN=1

   PATH_SEPARATOR=/
   PATH_SUBST:=$(BACKSLASH)
 endif
   PATH_SEPARATOR=/
   PATH_SUBST:=$(BACKSLASH)
 endif


@@ -552,9 +543,12 @@ $(ARCHINCDIR)/wx:
        mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR))
        mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
 
        mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR))
        mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
 

-$(SETUP_H): $(ARCHINCDIR)/wx
-       $(COPY) $(WXDIR)/include/wx/msw/setup.h $@
+# Copy ALWAYS uses forward slashes now.
+
+$(SETUP_H): $(ARCHINCDIR)/wx $(WXDIR)/include/wx/msw/setup.h
+       $(COPY) $(WXDIR)/include/wx/msw/setup.h $(subst $(BACKSLASH),/,$@)

 
 

+#      $(COPY) $(WXDIR)/include/wx/msw/setup.h $@

 #      $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
 
 ifndef WXMAKINGDLL
 #      $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
 
 ifndef WXMAKINGDLL


@@ -570,11 +564,12 @@ else
 ifeq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
 
 $(WXDLL): $(OBJECTS) $(EXTRAOBJS)
 ifeq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
 
 $(WXDLL): $(OBJECTS) $(EXTRAOBJS)

-       $(CC) -shared -o $@ \
+       $(CXX) -shared -o $@ \

          -Wl,--output-def,$(WXDEF) \
          -Wl,--out-implib,$(WXLIB) \
          $(OBJECTS) $(EXTRAOBJS) \
          -Wl,--output-def,$(WXDEF) \
          -Wl,--out-implib,$(WXLIB) \
          $(OBJECTS) $(EXTRAOBJS) \

-         $(DLL_LDFLAGS) $(DLL_LDLIBS)
+         $(DLL_LDFLAGS) $(DLL_LDLIBS) \
+      $(ALL_LDFLAGS_DLL)

 else
 
 ifeq ($(MINGW32),1)
 else
 
 ifeq ($(MINGW32),1)


@@ -595,11 +590,11 @@ $(WXDEF) $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
          $(OBJECTS) $(EXTRAOBJS) $(DLL_EXTRA_LIBS)
 
 $(WXDLL): $(OBJECTS) $(EXTRAOBJS) $(WXDEF)
          $(OBJECTS) $(EXTRAOBJS) $(DLL_EXTRA_LIBS)
 
 $(WXDLL): $(OBJECTS) $(EXTRAOBJS) $(WXDEF)

-       $(CC) -mdll -Wl,--base-file,wx.base -s -o $@ $(LD_STUFF)
+       $(CC) -mdll -Wl,--base-file,wx.base -s -o $@ $(LD_STUFF) $(ALL_LDFLAGS_DLL)

        $(DLLTOOL) $(DLL_STUFF)
        $(DLLTOOL) $(DLL_STUFF)

-       $(CC) -mdll -Wl,--base-file,wx.base wx.exp -s -o $@ $(LD_STUFF)
+       $(CC) -mdll -Wl,--base-file,wx.base wx.exp -s -o $@ $(LD_STUFF) $(ALL_LDFLAGS_DLL)

        $(DLLTOOL) $(DLL_STUFF)
        $(DLLTOOL) $(DLL_STUFF)

-       $(CC) -mdll wx.exp -o $@ $(LD_STUFF)
+       $(CC) -mdll wx.exp -o $@ $(LD_STUFF) $(ALL_LDFLAGS_DLL)

        -$(RM) wx.base
        -$(RM) wx.exp
 
        -$(RM) wx.base
        -$(RM) wx.exp
 


@@ -625,12 +620,12 @@ $(TIFFLIB): $(TIFFOBJS)
        $(RANLIB) $@
 
 $(REGEXLIB):
        $(RANLIB) $@
 
 $(REGEXLIB):

-       $(MAKE) -C $(REGEXDIR) -f makefile.g95 WXDIR=$(WXDIR)
+       $(MAKE) -C $(REGEXDIR) -f makefile.g95 MINGW32=$(MINGW32) WXDIR=$(WXDIR) WXWIN=$(WXDIR)

 
 $(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/wx/setup.h
 
 $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
 
 $(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/wx/setup.h
 
 $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c

-       $(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
+       $(CCLEX) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c

 
 $(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
        $(COPY) ../common/dosyacc.c ../common/y_tab.c
 
 $(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
        $(COPY) ../common/dosyacc.c ../common/y_tab.c