Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Regenerate makefile.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-02-04 14:24:30 +00:00
parent 76f27d0177
commit f8227642cf
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/msw/makefile.g95
View File

@@ -31,7 +31,7 @@ DLL_BASE_LDLIBS = $(DLL_EXTRA_LIBS) -lstdc++ -lwsock32
ifeq ($(wxUSE_GUI),0) ifeq ($(wxUSE_GUI),0)
DLL_LDLIBS = $(DLL_BASE_LDLIBS) DLL_LDLIBS = $(DLL_BASE_LDLIBS)
else else
DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \ DLL_LDLIBS = -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
-luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \ -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
$(DLL_BASE_LDLIBS) $(DLL_BASE_LDLIBS)
endif endif
@@ -62,15 +62,12 @@ DOCDIR = $(WXDIR)/docs
# Only use the WIN32 wxDirDialog if we have a recent # Only use the WIN32 wxDirDialog if we have a recent
# version of Mingw32 # version of Mingw32
ifeq ($(MINGW32),1) ifeq "$(strip $(RECENT_MINGW))" "yes"
ifneq "$(_GCC295)$(_GCC3)" ""
DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF) DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF)
else
DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
endif
else else
DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF) DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
endif endif
ifeq ($(wxUSE_GUI),0) ifeq ($(wxUSE_GUI),0)
DIRDLGOBJ = DIRDLGOBJ =
endif endif
@@ -507,12 +504,8 @@ TIFFOBJS = $(TIFFDIR)/tif_aux.o \
$(TIFFDIR)/tif_write.o \ $(TIFFDIR)/tif_write.o \
$(TIFFDIR)/tif_zip.o $(TIFFDIR)/tif_zip.o
ifeq ($(MINGW32),1) ifeq "$(strip $(RECENT_MINGW))" "yes"
ifneq "$(_GCC295)$(_GCC3)" "" OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
else
OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
endif
else else
OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
endif endif
@@ -547,7 +540,7 @@ $(ARCHINCDIR)/wx:
# Copy ALWAYS uses forward slashes now. # Copy ALWAYS uses forward slashes now.
$(SETUP_H): $(ARCHINCDIR)/wx $(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 $(subst $(BACKSLASH),/,$@)
# $(COPY) $(WXDIR)/include/wx/msw/setup.h $@ # $(COPY) $(WXDIR)/include/wx/msw/setup.h $@
@@ -566,11 +559,12 @@ else
ifeq "$(strip $(LD_SUPPORTS_SHARED))" "yes" ifeq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
$(WXDLL): $(OBJECTS) $(EXTRAOBJS) $(WXDLL): $(OBJECTS) $(EXTRAOBJS)
$(CC) -shared -o $@ \ $(CXX) -shared -o $@ \
-Wl,--output-def,$(WXDEF) \ -Wl,--output-def,$(WXDEF) \
-Wl,--out-implib,$(WXLIB) \ -Wl,--out-implib,$(WXLIB) \
$(OBJECTS) $(EXTRAOBJS) \ $(OBJECTS) $(EXTRAOBJS) \
$(DLL_LDFLAGS) $(DLL_LDLIBS) $(DLL_LDFLAGS) $(DLL_LDLIBS) \
$(ALL_LDFLAGS_DLL)
else else
ifeq ($(MINGW32),1) ifeq ($(MINGW32),1)
@@ -591,11 +585,11 @@ $(WXDEF) $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
$(OBJECTS) $(EXTRAOBJS) $(DLL_EXTRA_LIBS) $(OBJECTS) $(EXTRAOBJS) $(DLL_EXTRA_LIBS)
$(WXDLL): $(OBJECTS) $(EXTRAOBJS) $(WXDEF) $(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.base
-$(RM) wx.exp -$(RM) wx.exp
@@ -626,7 +620,7 @@ $(REGEXLIB):
$(OBJECTS): $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/wx/setup.h $(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 $(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 $(COMMDIR)/y_tab.c: $(COMMDIR)/dosyacc.c
$(COPY) ../common/dosyacc.c ../common/y_tab.c $(COPY) ../common/dosyacc.c ../common/y_tab.c