diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index ebdffa61a0..329b50bd56 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -49,9 +49,9 @@ EXEC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) EXEC_OBJECTS = \ + $(__exec___win32rc) \ $(__exec_os2_lib_res) \ - exec_exec.o \ - $(__exec___win32rc) + exec_exec.o ### Conditionally set variables: ### @@ -94,6 +94,7 @@ COND_PLATFORM_OS2_1___exec___os2_emxbindcmd = $(NM) exec$(EXEEXT) | if grep -q \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_PLATFORM_WIN32_1@__exec___win32rc = exec_sample_rc.o @COND_PLATFORM_OS2_1@__exec_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__exec_app_Contents_PkgInfo___depname \ @@ -109,7 +110,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_PLATFORM_WIN32_1@__exec___win32rc = exec_exec_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -184,12 +184,21 @@ exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc) @COND_PLATFORM_MACOSX_1@exec_bundle: $(____exec_BUNDLE_TGT_REF_DEP) +exec_sample_rc.o: $(srcdir)/../../samples/sample.rc + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + exec_exec.o: $(srcdir)/exec.cpp $(CXXC) -c -o $@ $(EXEC_CXXFLAGS) $(srcdir)/exec.cpp -exec_exec_rc.o: $(srcdir)/exec.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d diff --git a/samples/exec/exec.bkl b/samples/exec/exec.bkl index 9cb4a4c6c0..eacd1cd87c 100644 --- a/samples/exec/exec.bkl +++ b/samples/exec/exec.bkl @@ -7,7 +7,6 @@ exec.cpp core base - exec.rc diff --git a/samples/exec/exec.dsp b/samples/exec/exec.dsp index ddbb2d7a53..177a23d588 100644 --- a/samples/exec/exec.dsp +++ b/samples/exec/exec.dsp @@ -256,7 +256,7 @@ SOURCE=.\exec.cpp # End Source File # Begin Source File -SOURCE=.\exec.rc +SOURCE=.\..\..\samples\sample.rc # End Source File # End Group # End Target diff --git a/samples/exec/exec.rc b/samples/exec/exec.rc deleted file mode 100644 index ba869e697b..0000000000 --- a/samples/exec/exec.rc +++ /dev/null @@ -1,5 +0,0 @@ -#include "wx/msw/wx.rc" - -#define MINIMAL_QUIT 1 -#define MINIMAL_ABOUT 102 - diff --git a/samples/exec/exec_vc7.vcproj b/samples/exec/exec_vc7.vcproj index e113c57f49..e2ea3110f1 100644 --- a/samples/exec/exec_vc7.vcproj +++ b/samples/exec/exec_vc7.vcproj @@ -633,7 +633,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"> + RelativePath=".\..\..\samples\sample.rc"/> diff --git a/samples/exec/exec_vc8.vcproj b/samples/exec/exec_vc8.vcproj index 9539f48ad4..37c569b1d6 100644 --- a/samples/exec/exec_vc8.vcproj +++ b/samples/exec/exec_vc8.vcproj @@ -793,7 +793,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" > diff --git a/samples/exec/makefile.bcc b/samples/exec/makefile.bcc index 3dca8bd625..023680edfd 100644 --- a/samples/exec/makefile.bcc +++ b/samples/exec/makefile.bcc @@ -228,14 +228,14 @@ clean: -if exist $(OBJS)\exec.ilf del $(OBJS)\exec.ilf -if exist $(OBJS)\exec.ils del $(OBJS)\exec.ils -$(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_exec.res +$(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_sample.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| - c0w32.obj $(EXEC_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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\exec_exec.res + c0w32.obj $(EXEC_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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\exec_sample.res | +$(OBJS)\exec_sample.res: .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__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) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc + $(OBJS)\exec_exec.obj: .\exec.cpp $(CXX) -q -c -P -o$@ $(EXEC_CXXFLAGS) .\exec.cpp -$(OBJS)\exec_exec.res: .\exec.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__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) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\exec.rc - diff --git a/samples/exec/makefile.gcc b/samples/exec/makefile.gcc index 5b6095bf21..343418a842 100644 --- a/samples/exec/makefile.gcc +++ b/samples/exec/makefile.gcc @@ -28,8 +28,8 @@ EXEC_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \ $(CPPFLAGS) $(CXXFLAGS) EXEC_OBJECTS = \ - $(OBJS)\exec_exec.o \ - $(OBJS)\exec_exec_rc.o + $(OBJS)\exec_sample_rc.o \ + $(OBJS)\exec_exec.o ### Conditionally set variables: ### @@ -223,15 +223,15 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe -$(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_exec_rc.o +$(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_sample_rc.o $(CXX) -o $@ $(EXEC_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) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 +$(OBJS)\exec_sample_rc.o: ./../../samples/sample.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) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + $(OBJS)\exec_exec.o: ./exec.cpp $(CXX) -c -o $@ $(EXEC_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\exec_exec_rc.o: ./exec.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) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - .PHONY: all clean diff --git a/samples/exec/makefile.vc b/samples/exec/makefile.vc index 72745518e2..91a589a1bb 100644 --- a/samples/exec/makefile.vc +++ b/samples/exec/makefile.vc @@ -29,8 +29,8 @@ EXEC_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ $(CPPFLAGS) $(CXXFLAGS) EXEC_OBJECTS = \ - $(OBJS)\exec_exec.obj \ - $(OBJS)\exec_exec.res + $(OBJS)\exec_sample.res \ + $(OBJS)\exec_exec.obj ### Conditionally set variables: ### @@ -304,14 +304,14 @@ clean: -if exist $(OBJS)\exec.ilk del $(OBJS)\exec.ilk -if exist $(OBJS)\exec.pdb del $(OBJS)\exec.pdb -$(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_exec.res +$(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_sample.res link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\exec.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< $(EXEC_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) $(__GDIPLUS_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 << +$(OBJS)\exec_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __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) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + $(OBJS)\exec_exec.obj: .\exec.cpp $(CXX) /c /nologo /TP /Fo$@ $(EXEC_CXXFLAGS) .\exec.cpp -$(OBJS)\exec_exec.res: .\exec.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __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) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\exec.rc - diff --git a/samples/exec/makefile.wat b/samples/exec/makefile.wat index f792d783f7..71670dee13 100644 --- a/samples/exec/makefile.wat +++ b/samples/exec/makefile.wat @@ -246,7 +246,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe -$(OBJS)\exec.exe : $(EXEC_OBJECTS) $(OBJS)\exec_exec.res +$(OBJS)\exec.exe : $(EXEC_OBJECTS) $(OBJS)\exec_sample.res @%create $(OBJS)\exec.lbc @%append $(OBJS)\exec.lbc option quiet @%append $(OBJS)\exec.lbc name $^@ @@ -254,13 +254,13 @@ $(OBJS)\exec.exe : $(EXEC_OBJECTS) $(OBJS)\exec_exec.res @%append $(OBJS)\exec.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' @for %i in ($(EXEC_OBJECTS)) do @%append $(OBJS)\exec.lbc file %i @for %i in ( $(__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) $(__GDIPLUS_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) do @%append $(OBJS)\exec.lbc library %i - @%append $(OBJS)\exec.lbc option resource=$(OBJS)\exec_exec.res + @%append $(OBJS)\exec.lbc option resource=$(OBJS)\exec_sample.res @for %i in () do @%append $(OBJS)\exec.lbc option stack=%i wlink @$(OBJS)\exec.lbc +$(OBJS)\exec_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(OBJS)\exec_exec.obj : .AUTODEPEND .\exec.cpp $(CXX) -bt=nt -zq -fo=$^@ $(EXEC_CXXFLAGS) $< -$(OBJS)\exec_exec.res : .AUTODEPEND .\exec.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< -