wxID_PREFERENCES added for the preferences menu item

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

diff --git a/samples/richedit/makefile.gcc b/samples/richedit/makefile.gcc
index 1e889457858b176f74893c1b82cc274329faff89..525a90a74374b1085f761812a796a50d58608355 100644 (file)
--- a/samples/richedit/makefile.gcc
+++ b/samples/richedit/makefile.gcc
@@ -116,10 +116,10 @@ ifeq ($(BUILD),release)
 __OPTIMIZEFLAG_2 = -O2
 endif
 ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE
 endif
 ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
+__UNICODE_DEFINE_p_1 = --define _UNICODE
 endif
 ifeq ($(MSLU),1)
 __UNICOWS_LIB_p = -lunicows
@@ -149,7 +149,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\richedit.exe
+all: $(OBJS)\richedit.exe data
 
 $(OBJS)\richedit_kbList.o: ./kbList.cpp
        $(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
@@ -173,7 +173,11 @@ clean:
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\richedit.exe del $(OBJS)\richedit.exe
 
+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_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 data