X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/444833b32388f4901ab5bc092b210b28230bebbd..f1d5aa4eca541a2f90044a63f555985d6bd4adf3:/samples/exec/makefile.wat

diff --git a/samples/exec/makefile.wat b/samples/exec/makefile.wat
index 6a734f9188..71670dee13 100644
--- a/samples/exec/makefile.wat
+++ b/samples/exec/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.3 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -195,6 +195,9 @@ __THREAD_DEFINE_p =
 __THREAD_DEFINE_p = -dwxNO_THREADS
 !endif
 __UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE
 !endif
@@ -243,21 +246,21 @@ clean : .SYMBOLIC
 	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
 	-if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe
 
-$(OBJS)\exec.exe :  $(EXEC_OBJECTS) $(OBJS)\exec_exec.res
+$(OBJS)\exec.exe :  $(EXEC_OBJECTS) $(OBJS)\exec_sample.res
 	@%create $(OBJS)\exec.lbc
 	@%append $(OBJS)\exec.lbc option quiet
 	@%append $(OBJS)\exec.lbc name $^@
 	@%append $(OBJS)\exec.lbc option caseexact
 	@%append $(OBJS)\exec.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
 	@for %i in ($(EXEC_OBJECTS)) do @%append $(OBJS)\exec.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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\exec.lbc library %i
-	@%append $(OBJS)\exec.lbc option resource=$(OBJS)\exec_exec.res
+	@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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\exec.lbc library %i
+	@%append $(OBJS)\exec.lbc option resource=$(OBJS)\exec_sample.res
 	@for %i in () do @%append $(OBJS)\exec.lbc option stack=%i
 	wlink @$(OBJS)\exec.lbc
 
+$(OBJS)\exec_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+	wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
 $(OBJS)\exec_exec.obj :  .AUTODEPEND .\exec.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(EXEC_CXXFLAGS) $<
 
-$(OBJS)\exec_exec.res :  .AUTODEPEND .\exec.rc
-	wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-