X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d90d6ea7a007332aa75779f90b30ed39872e494..cb7d73757f9e8771e7d8fc6b22f1acf27aac35bd:/samples/opengl/isosurf/makefile.bcc?ds=sidebyside diff --git a/samples/opengl/isosurf/makefile.bcc b/samples/opengl/isosurf/makefile.bcc index fcd6d935a6..57f0dfd6c0 100644 --- a/samples/opengl/isosurf/makefile.bcc +++ b/samples/opengl/isosurf/makefile.bcc @@ -21,7 +21,7 @@ BCCDIR = $(MAKEDIR)\.. ### Variables: ### -WX_RELEASE_NODOT = 26 +WX_RELEASE_NODOT = 27 OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) LIBDIRNAME = .\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG) @@ -30,9 +30,9 @@ SETUPHDIR = \ ISOSURF_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) \ - $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I.\..\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples \ + -DNOPCH $(CPPFLAGS) $(CXXFLAGS) ISOSURF_OBJECTS = \ $(OBJS)\isosurf_isosurf.obj @@ -146,6 +146,12 @@ __UNICODE_DEFINE_p = -D_UNICODE !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p_1 = -d_UNICODE !endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1 +!endif !if "$(SHARED)" == "1" __DLLFLAG_p = -DWXUSINGDLL !endif @@ -221,7 +227,7 @@ data: for %f in (isosurf.dat.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\isosurf_sample.res: .\..\..\..\samples\sample.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i.\..\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples $** $(OBJS)\isosurf_isosurf.obj: .\isosurf.cpp $(CXX) -q -c -P -o$@ $(ISOSURF_CXXFLAGS) $**