Fixed compile error (seen on OS/2).

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

diff --git a/contrib/build/animate/makefile.bcc b/contrib/build/animate/makefile.bcc
index 7a25f8e82183f3beba3cebc82d7fdf37be5080bc..09a98210307f0af24628d20777dc61d8f0b860e1 100644 (file)
--- a/contrib/build/animate/makefile.bcc
+++ b/contrib/build/animate/makefile.bcc
@@ -8,7 +8,7 @@
 BCCDIR = $(MAKEDIR)\..
 !endif
 
 BCCDIR = $(MAKEDIR)\..
 !endif
 

-!include ../../../build/config.bcc
+!include ../../../build/msw/config.bcc

 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!


@@ -20,35 +20,35 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \

        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \

-       $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include \
-       -I..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-       -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) -Hu -H=$(OBJS)\wxprec_animatedll.csm
        -I..\..\src\animate\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE \
        $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_animatedll.csm

-ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+ANIMATEDLL_OBJECTS =  \
+       $(OBJS)\animatedll_dummy.obj \
+       $(OBJS)\animatedll_animate.obj
+ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \

        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \

-       $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include \
-       -I..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-       -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) -Hu \
        -H=$(OBJS)\wxprec_animatelib.csm
        -I..\..\src\animate\..\..\include $(CXXFLAGS) -Hu \
        -H=$(OBJS)\wxprec_animatelib.csm

+ANIMATELIB_OBJECTS =  \
+       $(OBJS)\animatelib_dummy.obj \
+       $(OBJS)\animatelib_animate.obj

 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 

+!if "$(SHARED)" == "0"
+LIBDIRNAME = ..\..\src\animate\..\..\..\lib\bcc_lib$(CFG)
+!endif
+!if "$(SHARED)" == "1"
+LIBDIRNAME = ..\..\src\animate\..\..\..\lib\bcc_dll$(CFG)
+!endif

 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif
 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif


@@ -61,7 +61,10 @@ VENDORTAG = _$(VENDOR)
 !if "$(OFFICIAL_BUILD)" == "1"
 VENDORTAG = 
 !endif
 !if "$(OFFICIAL_BUILD)" == "1"
 VENDORTAG = 
 !endif

-!if "$(BUILD)" == "debug"
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_FLAG)" == "1"

 WXDEBUGFLAG = d
 !endif
 !if "$(SHARED)" == "1"
 WXDEBUGFLAG = d
 !endif
 !if "$(SHARED)" == "1"


@@ -73,15 +76,33 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif

-!if "$(BUILD)" == "debug"
-__DEBUGFLAG = -v
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v

 !endif
 !endif

-!if "$(BUILD)" == "release"
-__DEBUGFLAG = -v-
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-

 !endif
 !endif

-!if "$(BUILD)" == "debug"
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"

 __DEBUG_DEFINE_p = -D__WXDEBUG__
 !endif
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 !endif

+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif

 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG = -Od
 !endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG = -Od
 !endif


@@ -103,6 +124,9 @@ __RUNTIME_LIBS_7 =
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -119,11 +143,11 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 !endif
 !if "$(SHARED)" == "1"
 __animatedll___depname = \
 !endif
 !if "$(SHARED)" == "1"
 __animatedll___depname = \

-       ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll

 !endif
 !if "$(SHARED)" == "0"
 __animatelib___depname = \
 !endif
 !if "$(SHARED)" == "0"
 __animatelib___depname = \

-       ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib

 !endif
 
 
 !endif
 
 


@@ -148,24 +172,24 @@ $(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
        $(CXX) -q -c -P -o$@ $(ANIMATELIB_CXXFLAGS) -H $**
 
 !if "$(SHARED)" == "1"
        $(CXX) -q -c -P -o$@ $(ANIMATELIB_CXXFLAGS) -H $**
 
 !if "$(SHARED)" == "1"

-..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll: $(OBJS)\animatedll_dummy.obj $(OBJS)\animatedll_dummy.obj $(OBJS)\animatedll_animate.obj
-       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG)  -L..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&|
-       c0d32.obj  $(OBJS)\animatedll_dummy.obj $(OBJS)\animatedll_animate.obj,$@,, $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,,
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll: $(OBJS)\animatedll_dummy.obj  $(ANIMATEDLL_OBJECTS)
+       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
+       c0d32.obj $(ANIMATEDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,

 |
 |

-       implib -f ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate $@
+       implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate $@

 !endif
 
 !if "$(SHARED)" == "0"
 !endif
 
 !if "$(SHARED)" == "0"

-..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib: $(OBJS)\animatelib_dummy.obj $(OBJS)\animatelib_dummy.obj $(OBJS)\animatelib_animate.obj
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib: $(OBJS)\animatelib_dummy.obj  $(ANIMATELIB_OBJECTS)

        if exist $@ del $@
        tlib /a /p2048 $@ @&&|
        if exist $@ del $@
        tlib /a /p2048 $@ @&&|

-       $(OBJS)\animatelib_dummy.obj $(OBJS)\animatelib_animate.obj
+       $(ANIMATELIB_OBJECTS)

 |
 !endif
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
 |
 !endif
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res

-       -if exist ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll del ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll
-       -if exist ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
-       -if exist ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib