assert in AddCatalog() if Init() hadn't been called and also check that we have a...

[wxWidgets.git] / samples / mobile / makefile.wat

diff --git a/samples/mobile/makefile.wat b/samples/mobile/makefile.wat
index bd295a219dc60eac3284f62bf0fadf1f9b50d998..309e13f04c8ed37a1806c64df0b44a51f72690bc 100644 (file)
--- a/samples/mobile/makefile.wat
+++ b/samples/mobile/makefile.wat
@@ -1,10 +1,10 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.5 (http://www.bakefile.org)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

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

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


@@ -27,121 +27,49 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 

-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = msw
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-WXDEBUGFLAG = d
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXUNIVNAME =
-!ifeq WXUNIV 1
-WXUNIVNAME = univ
-!endif
-__DEBUGFLAG_0 =
-!ifeq BUILD debug
-__DEBUGFLAG_0 = -d2
-!endif
-!ifeq BUILD release
-__DEBUGFLAG_0 = -d0
-!endif
-__DEBUGFLAG_1 =
-!ifeq BUILD debug
-__DEBUGFLAG_1 = debug all
-!endif
-!ifeq BUILD release
-__DEBUGFLAG_1 = 
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-__OPTIMIZEFLAG_2 =
-!ifeq BUILD debug
-__OPTIMIZEFLAG_2 = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG_2 = -ot -ox
-!endif
-__RUNTIME_LIBS_5 =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_5 = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_5 = 
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1
-!endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif

 
 ### Variables: ###
 
 
 ### Variables: ###
 

-MOBILE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib  -i=.\..\..\src\regex -i=.\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $(CXXFLAGS) 
-OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" &
+       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &
+       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
+       USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" &
+       USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &
+       RUNTIME_LIBS="$(RUNTIME_LIBS)"

 
 
 
 

-all : $(OBJS)
-$(OBJS) :
-       -if not exist $(OBJS) mkdir $(OBJS)
-

 ### Targets: ###
 
 ### Targets: ###
 

-all : .SYMBOLIC $(OBJS)\mobile.exe
-
-$(OBJS)\mobile_mobile.obj :  .AUTODEPEND .\mobile.cpp
-       $(CXX) -zq -fo=$^@ $(MOBILE_CXXFLAGS) $<
-
-$(OBJS)\mobile_mobile.res :  .AUTODEPEND .\mobile.rc
-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib  -i=.\..\..\src\regex -i=.\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $<
+all : .SYMBOLIC styles wxedit

 
 clean : .SYMBOLIC 
 
 clean : .SYMBOLIC 

-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-       -if exist $(OBJS)\mobile.exe del $(OBJS)\mobile.exe
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
+       -if exist .\*.lbc del .\*.lbc
+       -if exist .\*.ilk del .\*.ilk
+       -if exist .\*.pch del .\*.pch
+       cd styles
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd wxedit
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+
+styles : .SYMBOLIC 
+       cd styles
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+wxedit : .SYMBOLIC 
+       cd wxedit
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)

 
 

-$(OBJS)\mobile.exe :  $(OBJS)\mobile_mobile.obj $(OBJS)\mobile_mobile.res
-       @%create $(OBJS)\mobile.lbc
-       @%append $(OBJS)\mobile.lbc option quiet
-       @%append $(OBJS)\mobile.lbc name $^@
-       @%append $(OBJS)\mobile.lbc option incremental
-       @%append $(OBJS)\mobile.lbc $(LDFLAGS) $(__DEBUGFLAG_1)  libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16'
-       @for %i in ( $(OBJS)\mobile_mobile.obj) do @%append $(OBJS)\mobile.lbc file %i
-       @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\mobile.lbc library %i
-       @%append $(OBJS)\mobile.lbc option resource=$(OBJS)\mobile_mobile.res
-       wlink @$(OBJS)\mobile.lbc