Commiting re-baked files after wxListCtrl OS X additions.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -132,7 +132,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: internat$(EXEEXT) $(__internat_bundle___depname) bg cs de fr ka pl ru sv ja ja_JP.EUC-JP
|
||||
all: internat$(EXEEXT) $(__internat_bundle___depname) ar bg cs de fr ka pl ru sv ja ja_JP.EUC-JP
|
||||
|
||||
install: all
|
||||
|
||||
@@ -178,6 +178,18 @@ internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@internat_bundle: $(____internat_BUNDLE_TGT_REF_DEP)
|
||||
|
||||
ar:
|
||||
@mkdir -p ./ar
|
||||
@for f in internat.po internat.mo; do \
|
||||
if test ! -f ./ar/$$f -a ! -d ./ar/$$f ; \
|
||||
then x=yep ; \
|
||||
else x=`find $(srcdir)/ar/$$f -newer ./ar/$$f -print` ; \
|
||||
fi; \
|
||||
case "$$x" in ?*) \
|
||||
cp -pRf $(srcdir)/ar/$$f ./ar ;; \
|
||||
esac; \
|
||||
done
|
||||
|
||||
bg:
|
||||
@mkdir -p ./bg
|
||||
@for f in internat.po internat.mo; do \
|
||||
@@ -308,4 +320,4 @@ internat_internat_rc.o: $(srcdir)/internat.rc
|
||||
# Include dependency info, if present:
|
||||
@IF_GNU_MAKE@-include .deps/*.d
|
||||
|
||||
.PHONY: all install uninstall clean distclean internat_bundle bg cs de fr ka pl ru sv ja ja_JP.EUC-JP
|
||||
.PHONY: all install uninstall clean distclean internat_bundle ar bg cs de fr ka pl ru sv ja ja_JP.EUC-JP
|
||||
|
@@ -199,7 +199,7 @@ $(OBJS):
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: $(OBJS)\internat.exe bg cs de fr ka pl ru sv ja ja_JP.EUC-JP
|
||||
all: $(OBJS)\internat.exe ar bg cs de fr ka pl ru sv ja ja_JP.EUC-JP
|
||||
|
||||
clean:
|
||||
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
|
||||
@@ -217,6 +217,10 @@ $(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res
|
||||
c0w32.obj $(INTERNAT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\internat_internat.res
|
||||
|
|
||||
|
||||
ar:
|
||||
if not exist $(OBJS)\ar mkdir $(OBJS)\ar
|
||||
for %f in (internat.po internat.mo) do if not exist $(OBJS)\ar\%f copy .\ar\%f $(OBJS)\ar
|
||||
|
||||
bg:
|
||||
if not exist $(OBJS)\bg mkdir $(OBJS)\bg
|
||||
for %f in (internat.po internat.mo) do if not exist $(OBJS)\bg\%f copy .\bg\%f $(OBJS)\bg
|
||||
|
@@ -200,7 +200,7 @@ $(OBJS):
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: $(OBJS)\internat.exe bg cs de fr ka pl ru sv ja ja_JP.EUC-JP
|
||||
all: $(OBJS)\internat.exe ar bg cs de fr ka pl ru sv ja ja_JP.EUC-JP
|
||||
|
||||
clean:
|
||||
-if exist $(OBJS)\*.o del $(OBJS)\*.o
|
||||
@@ -210,6 +210,10 @@ clean:
|
||||
$(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat_rc.o
|
||||
$(CXX) -o $@ $(INTERNAT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
|
||||
|
||||
ar:
|
||||
if not exist $(OBJS)\ar mkdir $(OBJS)\ar
|
||||
for %%f in (internat.po internat.mo) do if not exist $(OBJS)\ar\%%f copy .\ar\%%f $(OBJS)\ar
|
||||
|
||||
bg:
|
||||
if not exist $(OBJS)\bg mkdir $(OBJS)\bg
|
||||
for %%f in (internat.po internat.mo) do if not exist $(OBJS)\bg\%%f copy .\bg\%%f $(OBJS)\bg
|
||||
@@ -256,7 +260,7 @@ $(OBJS)\internat_internat.o: ./internat.cpp
|
||||
$(OBJS)\internat_internat_rc.o: ./internat.rc
|
||||
windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
|
||||
|
||||
.PHONY: all clean bg cs de fr ka pl ru sv ja ja_JP.EUC-JP
|
||||
.PHONY: all clean ar bg cs de fr ka pl ru sv ja ja_JP.EUC-JP
|
||||
|
||||
|
||||
# Dependencies tracking:
|
||||
|
@@ -277,7 +277,7 @@ $(OBJS):
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: $(OBJS)\internat.exe bg cs de fr ka pl ru sv ja ja_JP.EUC-JP
|
||||
all: $(OBJS)\internat.exe ar bg cs de fr ka pl ru sv ja ja_JP.EUC-JP
|
||||
|
||||
clean:
|
||||
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
|
||||
@@ -292,6 +292,10 @@ $(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res
|
||||
$(INTERNAT_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
|
||||
<<
|
||||
|
||||
ar:
|
||||
if not exist $(OBJS)\ar mkdir $(OBJS)\ar
|
||||
for %f in (internat.po internat.mo) do if not exist $(OBJS)\ar\%f copy .\ar\%f $(OBJS)\ar
|
||||
|
||||
bg:
|
||||
if not exist $(OBJS)\bg mkdir $(OBJS)\bg
|
||||
for %f in (internat.po internat.mo) do if not exist $(OBJS)\bg\%f copy .\bg\%f $(OBJS)\bg
|
||||
|
@@ -223,7 +223,7 @@ $(OBJS) :
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all : .SYMBOLIC $(OBJS)\internat.exe bg cs de fr ka pl ru sv ja ja_JP.EUC-JP
|
||||
all : .SYMBOLIC $(OBJS)\internat.exe ar bg cs de fr ka pl ru sv ja ja_JP.EUC-JP
|
||||
|
||||
clean : .SYMBOLIC
|
||||
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
|
||||
@@ -245,6 +245,10 @@ $(OBJS)\internat.exe : $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res
|
||||
@for %i in () do @%append $(OBJS)\internat.lbc option stack=%i
|
||||
wlink @$(OBJS)\internat.lbc
|
||||
|
||||
ar : .SYMBOLIC
|
||||
if not exist $(OBJS)\ar mkdir $(OBJS)\ar
|
||||
for %f in (internat.po internat.mo) do if not exist $(OBJS)\ar\%f copy .\ar\%f $(OBJS)\ar
|
||||
|
||||
bg : .SYMBOLIC
|
||||
if not exist $(OBJS)\bg mkdir $(OBJS)\bg
|
||||
for %f in (internat.po internat.mo) do if not exist $(OBJS)\bg\%f copy .\bg\%f $(OBJS)\bg
|
||||
|
Reference in New Issue
Block a user