added IMPLEMENT_APP_CONSOLE

[wxWidgets.git] / contrib / build / animate / makefile.gcc

diff --git a/contrib/build/animate/makefile.gcc b/contrib/build/animate/makefile.gcc
index 41ee30de7510893d0811176efd00ee8898130060..4267fa259af063de6318e107e7d4910b78096cff 100644 (file)
--- a/contrib/build/animate/makefile.gcc
+++ b/contrib/build/animate/makefile.gcc
@@ -14,13 +14,7 @@ include ../../../build/msw/config.gcc
 
 ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(LIBDIRNAME) \
-       -I..\..\src\animate\..\..\..\src\tiff \
-       -I..\..\src\animate\..\..\..\src\jpeg \
-       -I..\..\src\animate\..\..\..\src\png \
-       -I..\..\src\animate\..\..\..\src\zlib \
-       -I..\..\src\animate\..\..\..\src\regex \
-       -I..\..\src\animate\..\..\..\src\expat\lib \
+       $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(SETUPHDIR) \
        -I..\..\src\animate\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE \
        $(CXXFLAGS)
 ANIMATEDLL_OBJECTS =  \
@@ -28,27 +22,27 @@ ANIMATEDLL_OBJECTS =  \
        $(OBJS)\animatedll_animate.o
 ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(LIBDIRNAME) \
-       -I..\..\src\animate\..\..\..\src\tiff \
-       -I..\..\src\animate\..\..\..\src\jpeg \
-       -I..\..\src\animate\..\..\..\src\png \
-       -I..\..\src\animate\..\..\..\src\zlib \
-       -I..\..\src\animate\..\..\..\src\regex \
-       -I..\..\src\animate\..\..\..\src\expat\lib \
+       $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(SETUPHDIR) \
        -I..\..\src\animate\..\..\include $(CXXFLAGS)
 ANIMATELIB_OBJECTS =  \
        $(OBJS)\animatelib_dummy.o \
        $(OBJS)\animatelib_animate.o
-LIBDIRNAME = \
-       ..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 
 ### Conditionally set variables: ###
 
 ifeq ($(GCC_VERSION),2.95)
 GCCFLAGS = -fvtable-thunks
 endif
+ifeq ($(SHARED),0)
+LIBDIRNAME = ..\..\src\animate\..\..\..\lib\gcc_lib$(CFG)
+endif
+ifeq ($(SHARED),1)
+LIBDIRNAME = ..\..\src\animate\..\..\..\lib\gcc_dll$(CFG)
+endif
 ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif
@@ -155,16 +149,16 @@ $(OBJS):
 
 all: $(__animatedll___depname) $(__animatelib___depname)
 
-$(OBJS)\animatedll_animate.o: ../../src/animate\animate.cpp
+$(OBJS)\animatedll_animate.o: ../../src/animate/animate.cpp
        $(CXX) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $<
 
-$(OBJS)\animatedll_dummy.o: ../../src/animate\..\..\..\src\msw\dummy.cpp
+$(OBJS)\animatedll_dummy.o: ../../src/animate/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $<
 
-$(OBJS)\animatelib_animate.o: ../../src/animate\animate.cpp
+$(OBJS)\animatelib_animate.o: ../../src/animate/animate.cpp
        $(CXX) -c -o $@ $(ANIMATELIB_CXXFLAGS) $<
 
-$(OBJS)\animatelib_dummy.o: ../../src/animate\..\..\..\src\msw\dummy.cpp
+$(OBJS)\animatelib_dummy.o: ../../src/animate/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(ANIMATELIB_CXXFLAGS) $<
 
 ifeq ($(SHARED),1)