Applied patch [ 853031 ] Japanese po file

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

diff --git a/samples/mobile/makefile.vc b/samples/mobile/makefile.vc
index de5571a6837ca8a0249d3d96774f015d49df450a..0fb8d8b17dae05cd88b62b27635f5cc8ff91305e 100644 (file)
--- a/samples/mobile/makefile.vc
+++ b/samples/mobile/makefile.vc
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-!include <../../build/config.vc>
+!include <../../build/msw/config.vc>
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -12,114 +12,33 @@
 
 ### Variables: ###
 
-MOBILE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\mobile.pdb $(__OPTIMIZEFLAG_3)  /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib  /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS)
-OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
+       LDFLAGS="$(LDFLAGS)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" CC="$(CC)" \
+       USE_GUI="$(USE_GUI)" MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" \
+       USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" DEBUG_INFO="$(DEBUG_INFO)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" VENDOR="$(VENDOR)" UNICODE="$(UNICODE)" \
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" MSLU="$(MSLU)" WXUNIV="$(WXUNIV)" \
+       RUNTIME_LIBS="$(RUNTIME_LIBS)" CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" \
+       SHARED="$(SHARED)" USE_ODBC="$(USE_ODBC)" USE_OPENGL="$(USE_OPENGL)"
 
 ### Conditionally set variables: ###
 
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug"
-WXDEBUGFLAG = d
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(BUILD)" == "debug"
-__DEBUGFLAG_0 = /Zi
-!endif
-!if "$(BUILD)" == "release"
-__DEBUGFLAG_0 = 
-!endif
-!if "$(BUILD)" == "debug"
-__DEBUGFLAG_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release"
-__DEBUGFLAG_1 = 
-!endif
-!if "$(BUILD)" == "debug"
-__DEBUGFLAG_2 = d
-!endif
-!if "$(BUILD)" == "release"
-__DEBUGFLAG_2 = 
-!endif
-!if "$(BUILD)" == "debug"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug"
-__DEBUG_DEFINE_p_1 = /d__WXDEBUG__
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /dWXUSINGDLL
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_3 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_3 = /O2
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_6 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_6 = T
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__
-!endif
 
 
-all: $(OBJS)
-$(OBJS):
-       -if not exist $(OBJS) mkdir $(OBJS)
-
 ### Targets: ###
 
-all: $(OBJS)\mobile.exe
-
-$(OBJS)\mobile_mobile.obj: .\mobile.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MOBILE_CXXFLAGS) $**
-
-$(OBJS)\mobile_mobile.res: .\mobile.rc
-       rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib  /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $**
+all: sub_styles sub_wxedit
 
 clean: 
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res
-       -if exist $(OBJS)\mobile.exe del $(OBJS)\mobile.exe
-
-$(OBJS)\mobile.exe: $(OBJS)\mobile_mobile.obj $(OBJS)\mobile_mobile.res
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1)  /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  /SUBSYSTEM:WINDOWS @<<
-       $(OBJS)\mobile_mobile.obj $(OBJS)\mobile_mobile.res  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(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
-<<
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
+
+sub_styles: 
+       cd styles
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)
+
+sub_wxedit: 
+       cd wxedit
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)