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

G95 makefiles:

Browse Source 
_Always_ use forward slashes when using copy.
Added OSTYPE to makef95.env to fool makefiles into
thinking that MSYS is being used, even when it is,
but only from DOS.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-09-25 11:20:21 +00:00
parent 3d940df52b
commit 10acf8094e
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
distrib/msw/tmake/g95.t
View File

@@ -343,9 +343,12 @@ $(ARCHINCDIR)/wx:
mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)) mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR))
mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx) mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
$(SETUP_H): $(ARCHINCDIR)/wx # Copy ALWAYS uses forward slashes now.
$(COPY) $(WXDIR)/include/wx/msw/setup.h $@
$(SETUP_H): $(ARCHINCDIR)/wx
$(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),$@) # $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
ifndef WXMAKINGDLL ifndef WXMAKINGDLL

10
src/makeg95.env
View File

@@ -15,8 +15,14 @@
MINGW32=1 MINGW32=1
# Set to the version you have # Set to the version you have
#MINGW32VERSION=2.95 MINGW32VERSION=2.95
MINGW32VERSION=3.0 #MINGW32VERSION=3.0
# If we're using MSYS, or other utilities that
# use forward slashes, we need to set this when
# invoking the makefile from DOS, or the wrong separators
# will be assumed.
OSTYPE=msys
# If building DLL, the version # If building DLL, the version
WXVERSION=233 WXVERSION=233

7
src/msw/makefile.g95
View File

@@ -546,9 +546,12 @@ $(ARCHINCDIR)/wx:
mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)) mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR))
mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx) mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
$(SETUP_H): $(ARCHINCDIR)/wx # Copy ALWAYS uses forward slashes now.
$(COPY) $(WXDIR)/include/wx/msw/setup.h $@
$(SETUP_H): $(ARCHINCDIR)/wx
$(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),$@) # $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
ifndef WXMAKINGDLL ifndef WXMAKINGDLL