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

Updated makefiles etc. for 2.5.1

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-09-15 15:36:27 +00:00
parent 70fb935a6a
commit ec08d395bd
861 changed files with 22670 additions and 18516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/shaped/Makefile.in
View File

@@ -19,6 +19,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
HOST_SUFFIX = @HOST_SUFFIX@
LDFLAGS = @LDFLAGS@
LDFLAGS_GUI = @LDFLAGS_GUI@
NM = @NM@
RESCOMP = @RESCOMP@
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -40,7 +41,7 @@ SHAPED_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
SHAPED_OBJECTS = \
shaped_shaped.o \
$(__shaped___win32rc)
WX_VERSION = 2.5.0
WX_VERSION = 2.5.1
### Conditionally set variables: ###
@@ -76,7 +77,7 @@ WX_VERSION = 2.5.0
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
$(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o shaped$(EXEEXT) Carbon.r \
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@ -92,8 +93,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_PLATFORM_MAC_1@__shaped___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@COND_PLATFORM_MAC_1@__shaped___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C shaped$(EXEEXT)
@COND_PLATFORM_OS2_1@__shaped___os2_emxbindcmd = \
@COND_PLATFORM_OS2_1@ emxbind -ep shaped$(EXEEXT)
COND_PLATFORM_OS2_1___shaped___os2_emxbindcmd = $(NM) shaped$(EXEEXT) | if grep \
-q pmwin.763 ; then emxbind -ep shaped$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__shaped___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___shaped___os2_emxbindcmd)
@COND_PLATFORM_WIN32_1@__shaped___win32rc = shaped_shaped_rc.o
@COND_PLATFORM_MACOSX_1@__shaped_bundle___depname = shaped_bundle
@@ -129,7 +131,7 @@ shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc)
$(__shaped___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
mkdir -p shaped.app/Contents
mkdir -p shaped.app/Contents/MacOS
mkdir -p shaped.app/Contents/Resources
@@ -147,7 +149,7 @@ shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in
ln -f shaped$(EXEEXT) shaped.app/Contents/MacOS/shaped
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc shaped.app/Contents/Resources/shaped.rsrc
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc shaped.app/Contents/Resources/shaped.rsrc
ln -f $(top_srcdir)/src/mac/wxmac.icns shaped.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@shaped_bundle: shaped.app/Contents/PkgInfo
@@ -156,7 +158,7 @@ shaped_shaped.o: $(srcdir)/shaped.cpp
$(CXXC) -c -o $@ $(SHAPED_CXXFLAGS) $<
shaped_shaped_rc.o: $(srcdir)/shaped.rc
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
uninstall:

4
samples/shaped/makefile.bcc
View File

@@ -157,7 +157,7 @@ $(OBJS)\shaped_shaped.obj: .\shaped.cpp
$(CXX) -q -c -P -o$@ $(SHAPED_CXXFLAGS) $**
$(OBJS)\shaped_shaped.res: .\shaped.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -175,5 +175,5 @@ data:
$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res
ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
c0w32.obj $(SHAPED_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\shaped_shaped.res
c0w32.obj $(SHAPED_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\shaped_shaped.res
|

2
samples/shaped/makefile.gcc
View File

@@ -151,7 +151,7 @@ $(OBJS)\shaped_shaped.o: ./shaped.cpp
$(CXX) -c -o $@ $(SHAPED_CXXFLAGS) $<
$(OBJS)\shaped_shaped_rc.o: ./shaped.rc
windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o

20
samples/shaped/makefile.vc
View File

@@ -18,9 +18,9 @@ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
SHAPED_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\shaped.pdb $(____DEBUGRUNTIME_2_p) \
$(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) \
/D_WINDOWS /I.\..\..\samples $(CXXFLAGS) /GR /GX
$(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \
/W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) /GR /GX
SHAPED_OBJECTS = \
$(OBJS)\shaped_shaped.obj \
$(OBJS)\shaped_shaped.res
@@ -126,6 +126,18 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
!endif
!if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_4 = /Od
!endif
@@ -220,7 +232,7 @@ $(OBJS)\shaped_shaped.obj: .\shaped.cpp
$(CXX) /c /nologo /TP /Fo$@ $(SHAPED_CXXFLAGS) $**
$(OBJS)\shaped_shaped.res: .\shaped.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $**
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $**
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj

2
samples/shaped/makefile.wat
View File

@@ -184,7 +184,7 @@ $(OBJS)\shaped_shaped.obj : .AUTODEPEND .\shaped.cpp
$(CXX) -zq -fo=$^@ $(SHAPED_CXXFLAGS) $<
$(OBJS)\shaped_shaped.res : .AUTODEPEND .\shaped.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
clean : .SYMBOLIC
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj