more samples makefiles fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 23:01:52 +00:00
parent 9a59a6671b
commit d179e30b0a
87 changed files with 4171 additions and 1733 deletions
--- a/samples/richedit/Makefile.in
+++ b/samples/richedit/Makefile.in
@@ -38,8 +38,12 @@ RICHEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
 	-I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS)
 RICHEDIT_OBJECTS =  \
-	richedit_richedit.o \
-	$(__richedit___win32rc)
+	$(__richedit___win32rc) \
+	richedit_wxLayout.o \
+	richedit_kbList.o \
+	richedit_wxllist.o \
+	richedit_wxlparser.o \
+	richedit_wxlwindow.o

 ### Conditionally set variables: ###

@@ -121,7 +125,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_PLATFORM_MAC_1@__richedit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@COND_PLATFORM_MAC_1@__richedit___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@	$(SETFILE) -a C richedit$(EXEEXT)
-@COND_PLATFORM_WIN32_1@__richedit___win32rc = richedit_richedit_rc.o
+@COND_PLATFORM_WIN32_1@__richedit___win32rc = richedit_sample_rc.o

 ### Targets: ###

@@ -145,12 +149,24 @@ richedit$(EXEEXT): $(RICHEDIT_OBJECTS) $(__richedit___win32rc)
 	$(__richedit___mac_rezcmd)
 	$(__richedit___mac_setfilecmd)

-richedit_richedit.o: $(srcdir)/richedit.cpp
+richedit_kbList.o: $(srcdir)/kbList.cpp
 	$(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $<

-richedit_richedit_rc.o: $(srcdir)/richedit.rc
+richedit_sample_rc.o: $(srcdir)/../../samples/sample.rc
 	$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)

+richedit_wxLayout.o: $(srcdir)/wxLayout.cpp
+	$(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
+
+richedit_wxllist.o: $(srcdir)/wxllist.cpp
+	$(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
+
+richedit_wxlparser.o: $(srcdir)/wxlparser.cpp
+	$(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
+
+richedit_wxlwindow.o: $(srcdir)/wxlwindow.cpp
+	$(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
+
 uninstall: 


--- a/samples/richedit/makefile.bcc
+++ b/samples/richedit/makefile.bcc
@@ -30,7 +30,11 @@ RICHEDIT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
 	-I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \
 	-I.\..\..\src\regex -I.\..\..\src\expat\lib -I. $(__DLLFLAG_p) $(CXXFLAGS)
 RICHEDIT_OBJECTS =  \
-	$(OBJS)\richedit_richedit.obj
+	$(OBJS)\richedit_wxLayout.obj \
+	$(OBJS)\richedit_kbList.obj \
+	$(OBJS)\richedit_wxllist.obj \
+	$(OBJS)\richedit_wxlparser.obj \
+	$(OBJS)\richedit_wxlwindow.obj

 ### Conditionally set variables: ###

@@ -147,18 +151,30 @@ $(OBJS):

 all: $(OBJS)\richedit.exe

-$(OBJS)\richedit_richedit.obj: .\richedit.cpp
+$(OBJS)\richedit_kbList.obj: .\kbList.cpp
 	$(CXX) -q -c -P -o$@ $(RICHEDIT_CXXFLAGS) $**

-$(OBJS)\richedit_richedit.res: .\richedit.rc
+$(OBJS)\richedit_sample.res: .\..\..\samples\sample.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$(LIBDIRNAME) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib  -i.\..\..\src\regex -i.\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) $**

+$(OBJS)\richedit_wxLayout.obj: .\wxLayout.cpp
+	$(CXX) -q -c -P -o$@ $(RICHEDIT_CXXFLAGS) $**
+
+$(OBJS)\richedit_wxllist.obj: .\wxllist.cpp
+	$(CXX) -q -c -P -o$@ $(RICHEDIT_CXXFLAGS) $**
+
+$(OBJS)\richedit_wxlparser.obj: .\wxlparser.cpp
+	$(CXX) -q -c -P -o$@ $(RICHEDIT_CXXFLAGS) $**
+
+$(OBJS)\richedit_wxlwindow.obj: .\wxlwindow.cpp
+	$(CXX) -q -c -P -o$@ $(RICHEDIT_CXXFLAGS) $**
+
 clean: 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 	-if exist $(OBJS)\*.res del $(OBJS)\*.res
 	-if exist $(OBJS)\richedit.exe del $(OBJS)\richedit.exe

-$(OBJS)\richedit.exe: $(RICHEDIT_OBJECTS)  $(OBJS)\richedit_richedit.res
+$(OBJS)\richedit.exe: $(RICHEDIT_OBJECTS)  $(OBJS)\richedit_sample.res
 	ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
-	c0w32.obj $(RICHEDIT_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  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\richedit_richedit.res
+	c0w32.obj $(RICHEDIT_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  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\richedit_sample.res
 |
--- a/samples/richedit/makefile.gcc
+++ b/samples/richedit/makefile.gcc
@@ -22,8 +22,12 @@ RICHEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
 	-I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex \
 	-I.\..\..\src\expat\lib -I. $(__DLLFLAG_p) $(CXXFLAGS)
 RICHEDIT_OBJECTS =  \
-	$(OBJS)\richedit_richedit.o \
-	$(OBJS)\richedit_richedit_rc.o
+	$(OBJS)\richedit_sample_rc.o \
+	$(OBJS)\richedit_wxLayout.o \
+	$(OBJS)\richedit_kbList.o \
+	$(OBJS)\richedit_wxllist.o \
+	$(OBJS)\richedit_wxlparser.o \
+	$(OBJS)\richedit_wxlwindow.o

 ### Conditionally set variables: ###

@@ -141,17 +145,29 @@ $(OBJS):

 all: $(OBJS)\richedit.exe

-$(OBJS)\richedit_richedit.o: .\richedit.cpp
+$(OBJS)\richedit_kbList.o: .\kbList.cpp
 	$(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $<

-$(OBJS)\richedit_richedit_rc.o: .\richedit.rc
+$(OBJS)\richedit_sample_rc.o: .\..\..\samples\sample.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 $(LIBDIRNAME) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib  --include-dir ./../../src/regex --include-dir ./../../src/expat/lib --include-dir . $(__DLLFLAG_p_1)

+$(OBJS)\richedit_wxLayout.o: .\wxLayout.cpp
+	$(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
+
+$(OBJS)\richedit_wxllist.o: .\wxllist.cpp
+	$(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
+
+$(OBJS)\richedit_wxlparser.o: .\wxlparser.cpp
+	$(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
+
+$(OBJS)\richedit_wxlwindow.o: .\wxlwindow.cpp
+	$(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
+
 clean: 
 	-if exist $(OBJS)\*.o del $(OBJS)\*.o
 	-if exist $(OBJS)\richedit.exe del $(OBJS)\richedit.exe

-$(OBJS)\richedit.exe: $(RICHEDIT_OBJECTS) $(OBJS)\richedit_richedit_rc.o
+$(OBJS)\richedit.exe: $(RICHEDIT_OBJECTS) $(OBJS)\richedit_sample_rc.o
 	$(CXX) -o $@ $(RICHEDIT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -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$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 .PHONY: all clean
--- a/samples/richedit/makefile.vc
+++ b/samples/richedit/makefile.vc
@@ -23,8 +23,12 @@ RICHEDIT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
 	/I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex \
 	/I.\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS $(CXXFLAGS)
 RICHEDIT_OBJECTS =  \
-	$(OBJS)\richedit_richedit.obj \
-	$(OBJS)\richedit_richedit.res
+	$(OBJS)\richedit_sample.res \
+	$(OBJS)\richedit_wxLayout.obj \
+	$(OBJS)\richedit_kbList.obj \
+	$(OBJS)\richedit_wxllist.obj \
+	$(OBJS)\richedit_wxlparser.obj \
+	$(OBJS)\richedit_wxlwindow.obj

 ### Conditionally set variables: ###

@@ -208,18 +212,30 @@ $(OBJS):

 all: $(OBJS)\richedit.exe

-$(OBJS)\richedit_richedit.obj: .\richedit.cpp
+$(OBJS)\richedit_kbList.obj: .\kbList.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(RICHEDIT_CXXFLAGS) $**

-$(OBJS)\richedit_richedit.res: .\richedit.rc
+$(OBJS)\richedit_sample.res: .\..\..\samples\sample.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 $(LIBDIRNAME) /i .\..\..\src\tiff /i .\..\..\src\jpeg /i .\..\..\src\png /i .\..\..\src\zlib  /i .\..\..\src\regex /i .\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS $**

+$(OBJS)\richedit_wxLayout.obj: .\wxLayout.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(RICHEDIT_CXXFLAGS) $**
+
+$(OBJS)\richedit_wxllist.obj: .\wxllist.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(RICHEDIT_CXXFLAGS) $**
+
+$(OBJS)\richedit_wxlparser.obj: .\wxlparser.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(RICHEDIT_CXXFLAGS) $**
+
+$(OBJS)\richedit_wxlwindow.obj: .\wxlwindow.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(RICHEDIT_CXXFLAGS) $**
+
 clean: 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 	-if exist $(OBJS)\*.res del $(OBJS)\*.res
 	-if exist $(OBJS)\richedit.exe del $(OBJS)\richedit.exe

-$(OBJS)\richedit.exe: $(RICHEDIT_OBJECTS) $(OBJS)\richedit_richedit.res
+$(OBJS)\richedit.exe: $(RICHEDIT_OBJECTS) $(OBJS)\richedit_sample.res
 	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 	$(RICHEDIT_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  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
 <<
--- a/samples/richedit/makefile.wat
+++ b/samples/richedit/makefile.wat
@@ -164,7 +164,11 @@ RICHEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
 	-i=.\..\..\src\zlib -i=.\..\..\src\regex -i=.\..\..\src\expat\lib -i=. &
 	$(__DLLFLAG_p) $(CXXFLAGS)
 RICHEDIT_OBJECTS =  &
-	$(OBJS)\richedit_richedit.obj
+	$(OBJS)\richedit_wxLayout.obj &
+	$(OBJS)\richedit_kbList.obj &
+	$(OBJS)\richedit_wxllist.obj &
+	$(OBJS)\richedit_wxlparser.obj &
+	$(OBJS)\richedit_wxlwindow.obj

 MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)

@@ -177,12 +181,24 @@ $(OBJS) :

 all : .SYMBOLIC $(OBJS)\richedit.exe

-$(OBJS)\richedit_richedit.obj :  .AUTODEPEND .\richedit.cpp
+$(OBJS)\richedit_kbList.obj :  .AUTODEPEND .\kbList.cpp
 	$(CXX) -zq -fo=$^@ $(RICHEDIT_CXXFLAGS) $<

-$(OBJS)\richedit_richedit.res :  .AUTODEPEND .\richedit.rc
+$(OBJS)\richedit_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
 	wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib  -i=.\..\..\src\regex -i=.\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $<

+$(OBJS)\richedit_wxLayout.obj :  .AUTODEPEND .\wxLayout.cpp
+	$(CXX) -zq -fo=$^@ $(RICHEDIT_CXXFLAGS) $<
+
+$(OBJS)\richedit_wxllist.obj :  .AUTODEPEND .\wxllist.cpp
+	$(CXX) -zq -fo=$^@ $(RICHEDIT_CXXFLAGS) $<
+
+$(OBJS)\richedit_wxlparser.obj :  .AUTODEPEND .\wxlparser.cpp
+	$(CXX) -zq -fo=$^@ $(RICHEDIT_CXXFLAGS) $<
+
+$(OBJS)\richedit_wxlwindow.obj :  .AUTODEPEND .\wxlwindow.cpp
+	$(CXX) -zq -fo=$^@ $(RICHEDIT_CXXFLAGS) $<
+
 clean : .SYMBOLIC 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 	-if exist $(OBJS)\*.res del $(OBJS)\*.res
@@ -190,7 +206,7 @@ clean : .SYMBOLIC
 	-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
 	-if exist $(OBJS)\richedit.exe del $(OBJS)\richedit.exe

-$(OBJS)\richedit.exe :  $(RICHEDIT_OBJECTS) $(OBJS)\richedit_richedit.res
+$(OBJS)\richedit.exe :  $(RICHEDIT_OBJECTS) $(OBJS)\richedit_sample.res
 	@%create $(OBJS)\richedit.lbc
 	@%append $(OBJS)\richedit.lbc option quiet
 	@%append $(OBJS)\richedit.lbc name $^@
@@ -198,5 +214,5 @@ $(OBJS)\richedit.exe :  $(RICHEDIT_OBJECTS) $(OBJS)\richedit_richedit.res
 	@%append $(OBJS)\richedit.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
 	@for %i in ($(RICHEDIT_OBJECTS)) do @%append $(OBJS)\richedit.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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\richedit.lbc library %i
-	@%append $(OBJS)\richedit.lbc option resource=$(OBJS)\richedit_richedit.res
+	@%append $(OBJS)\richedit.lbc option resource=$(OBJS)\richedit_sample.res
 	wlink @$(OBJS)\richedit.lbc
--- a/samples/richedit/richedit.bkl
+++ b/samples/richedit/richedit.bkl
@@ -4,10 +4,15 @@
    <include file="../../build/bakefiles/common_samples.bkl"/>

    <exe id="richedit" template="wx_sample" template_append="wx_append">
-        <sources>richedit.cpp</sources>
+        <sources>
+            wxLayout.cpp
+            kbList.cpp
+            wxllist.cpp
+            wxlparser.cpp
+            wxlwindow.cpp
+        </sources>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
-        <win32-res>richedit.rc</win32-res>
    </exe>

 </makefile>
--- a/samples/richedit/richedit.dsp
+++ b/samples/richedit/richedit.dsp
@@ -468,11 +468,27 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File

-SOURCE=.\richedit.cpp
+SOURCE=.\..\..\samples\sample.rc
 # End Source File
 # Begin Source File

-SOURCE=.\richedit.rc
+SOURCE=.\kbList.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\wxLayout.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\wxllist.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\wxlparser.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\wxlwindow.cpp
 # End Source File
 # End Group
 # End Target