X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25a73439590e04730168bee6b691bd6233880ad4..f5382a2f00a6002bf2fb06920e983c2702f80078:/samples/richedit/makefile.bcc

diff --git a/samples/richedit/makefile.bcc b/samples/richedit/makefile.bcc
index f738b3175e..e56acf3ec0 100644
--- a/samples/richedit/makefile.bcc
+++ b/samples/richedit/makefile.bcc
@@ -8,7 +8,7 @@
 BCCDIR = $(MAKEDIR)\..
 !endif
 
-!include ../../build/config.bcc
+!include ../../build/msw/config.bcc
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -20,20 +20,29 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
-LIBDIRNAME = \
-	.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
 	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-RICHEDIT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG_2) -tWM -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) $(CXXFLAGS)
+RICHEDIT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \
+	$(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \
+	-I. $(__DLLFLAG_p) -I.\..\..\samples $(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
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 
 ### Conditionally set variables: ###
 
+!if "$(SHARED)" == "0"
+LIBDIRNAME = .\..\..\lib\bcc_lib$(CFG)
+!endif
+!if "$(SHARED)" == "1"
+LIBDIRNAME = .\..\..\lib\bcc_dll$(CFG)
+!endif
 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif
@@ -113,10 +122,13 @@ __RUNTIME_LIBS_7 = i
 __RUNTIME_LIBS_7 = 
 !endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE
 !endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
@@ -143,20 +155,41 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\richedit.exe
+all: $(OBJS)\richedit.exe data
 
-$(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
-	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_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$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**
+
+$(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
-	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
+	-if exist $(OBJS)\richedit.tds del $(OBJS)\richedit.tds
+	-if exist $(OBJS)\richedit.ilc del $(OBJS)\richedit.ilc
+	-if exist $(OBJS)\richedit.ild del $(OBJS)\richedit.ild
+	-if exist $(OBJS)\richedit.ilf del $(OBJS)\richedit.ilf
+	-if exist $(OBJS)\richedit.ils del $(OBJS)\richedit.ils
+
+data: 
+	if not exist $(OBJS) mkdir $(OBJS)
+	for %f in (wxLayout.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\richedit.exe: $(RICHEDIT_OBJECTS)  $(OBJS)\richedit_sample.res
+	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__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  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\richedit_sample.res
 |