check the week day for consistency in ParseFormat() (replaces patch 788052)

[wxWidgets.git] / samples / richedit / makefile.gcc

diff --git a/samples/richedit/makefile.gcc b/samples/richedit/makefile.gcc
index c0d09cbca8ed4997d734d9b5f0c24860623c47d8..2d1504b50fb9dd5cc5d579d949d29cfa1c7149ed 100644 (file)
--- a/samples/richedit/makefile.gcc
+++ b/samples/richedit/makefile.gcc
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

-include ../../build/config.gcc
+include ../../build/msw/config.gcc

 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!


@@ -20,10 +20,14 @@ RICHEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        -DHAVE_W32API_H -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 \
        -DHAVE_W32API_H -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)
+       -I.\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\samples $(CXXFLAGS)

 RICHEDIT_OBJECTS =  \
 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: ###
 
 
 ### Conditionally set variables: ###
 


@@ -112,6 +116,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -139,17 +146,29 @@ $(OBJS):
 
 all: $(OBJS)\richedit.exe
 
 
 all: $(OBJS)\richedit.exe
 

-$(OBJS)\richedit_richedit.o: .\richedit.cpp
+$(OBJS)\richedit_kbList.o: .\kbList.cpp

        $(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
 

-$(OBJS)\richedit_richedit_rc.o: .\richedit.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_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) --include-dir ../../samples
+
+$(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
 
 
 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
-       $(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
+$(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)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 .PHONY: all clean
 
 .PHONY: all clean