X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7714864e2f21ef69ef273f3a7c58456e365539b9..c543817b3280c560d53307c0fa98e7a99aa00bf9:/samples/opengl/cube/Makefile.in diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in index 966724af41..f977cff4f5 100644 --- a/samples/opengl/cube/Makefile.in +++ b/samples/opengl/cube/Makefile.in @@ -58,6 +58,11 @@ CUBE_OBJECTS = \ @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ +@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS) +@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI) +@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) +@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = +@COND_USE_OPENGL_1@__cube___depname = cube$(EXEEXT) @COND_PLATFORM_MAC_1@__cube___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C cube$(EXEEXT) @COND_PLATFORM_MAC_1@__cube___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @@ -111,7 +116,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ ### Targets: ### -all: cube$(EXEEXT) $(__cube_bundle___depname) +all: $(__cube___depname) $(__cube_bundle___depname) install: all @@ -128,14 +133,14 @@ clean: distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -cube$(EXEEXT): $(CUBE_OBJECTS) $(__cube___win32rc) - $(CXX) -o $@ $(CUBE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) - $(__cube___mac_rezcmd) - $(__cube___mac_setfilecmd) - $(__cube___os2_emxbindcmd) - $(SAMPLES_RPATH_POSTLINK) +@COND_USE_OPENGL_1@cube$(EXEEXT): $(CUBE_OBJECTS) $(__cube___win32rc) +@COND_USE_OPENGL_1@ $(CXX) -o $@ $(CUBE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) +@COND_USE_OPENGL_1@ $(__cube___mac_rezcmd) +@COND_USE_OPENGL_1@ $(__cube___mac_setfilecmd) +@COND_USE_OPENGL_1@ $(__cube___os2_emxbindcmd) +@COND_USE_OPENGL_1@ $(SAMPLES_RPATH_POSTLINK) -cube.app/Contents/PkgInfo: cube$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +cube.app/Contents/PkgInfo: $(__cube___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p cube.app/Contents mkdir -p cube.app/Contents/MacOS mkdir -p cube.app/Contents/Resources