X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75a0a7b7de0cb3d5645ec014b60431b5fa2c7095..f5382a2f00a6002bf2fb06920e983c2702f80078:/samples/richedit/makefile.gcc

diff --git a/samples/richedit/makefile.gcc b/samples/richedit/makefile.gcc
index 3b4b992234..525a90a743 100644
--- 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,31 +149,35 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\richedit.exe
+all: $(OBJS)\richedit.exe data
 
-$(OBJS)\richedit_kbList.o: .\kbList.cpp
+$(OBJS)\richedit_kbList.o: ./kbList.cpp
 	$(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
 
-$(OBJS)\richedit_sample_rc.o: .\..\..\samples\sample.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 $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
 
-$(OBJS)\richedit_wxLayout.o: .\wxLayout.cpp
+$(OBJS)\richedit_wxLayout.o: ./wxLayout.cpp
 	$(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
 
-$(OBJS)\richedit_wxllist.o: .\wxllist.cpp
+$(OBJS)\richedit_wxllist.o: ./wxllist.cpp
 	$(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
 
-$(OBJS)\richedit_wxlparser.o: .\wxlparser.cpp
+$(OBJS)\richedit_wxlparser.o: ./wxlparser.cpp
 	$(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
 
-$(OBJS)\richedit_wxlwindow.o: .\wxlwindow.cpp
+$(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
 
+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