X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f55f5b81fbe7a2294912663c192113209bbc930..b53f5a2b6e5984164373761b566f6efbe092a7fd:/contrib/samples/animate/makefile.gcc

diff --git a/contrib/samples/animate/makefile.gcc b/contrib/samples/animate/makefile.gcc
index 2639575ea0..1b6e478c42 100644
--- a/contrib/samples/animate/makefile.gcc
+++ b/contrib/samples/animate/makefile.gcc
@@ -19,7 +19,8 @@ ANITEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
 	-I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \
 	$(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS)
 ANITEST_OBJECTS =  \
-	$(OBJS)\anitest_anitest.o
+	$(OBJS)\anitest_anitest.o \
+	$(OBJS)\anitest_anitest_rc.o
 LIBDIRNAME = \
 	.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
@@ -77,9 +78,20 @@ endif
 ifeq ($(DEBUG_FLAG),1)
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_FLAG),default)
+__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
+endif
+endif
+ifeq ($(DEBUG_FLAG),1)
+__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
+endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p = -DWXUSINGDLL
 endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
 ifeq ($(USE_GUI),1)
 __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
 endif
@@ -98,6 +110,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
+endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
@@ -112,6 +127,9 @@ endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
 
 
 all: $(OBJS)
@@ -125,7 +143,10 @@ all: $(OBJS)\anitest.exe data
 $(OBJS)\anitest_anitest.o: .\anitest.cpp
 	$(CXX) -c -o $@ $(ANITEST_CXXFLAGS) $<
 
-$(OBJS)\anitest.exe: $(ANITEST_OBJECTS)
+$(OBJS)\anitest_anitest_rc.o: .\anitest.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 ./../../include
+
+$(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_anitest_rc.o
 	$(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate $(__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
 
 clean: