Attachment #15710 for bug #26154

View | Details | Raw Unified | Return to bug 26154
Collapse All | Expand All




ifeq ($(OS),linux)
  ifeq ($(CPU),alpha)
    BINTARGETS = blenderdynamic
    # BINTARGETS += blenderplayer
  endif
  ifeq ($(CPU),i386)
    # BINTARGETS = plugin
    # BINTARGETS += ptest
    # BINTARGETS += xplink
    BINTARGETS = blenderdynamic
    # BINTARGETS += blenderplayer
    # BINTARGETS += blenderstatic
  endif
  ifeq ($(CPU),powerpc)
    BINTARGETS = blenderdynamic
    # BINTARGETS += blenderstatic
  endif
    PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
    PYLIB += $(NAN_MXTEXTTOOLS)

     NAN_SND_LIBS = $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
     NAN_SND_LIBS += $(OCGDIR)/intern/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
     NAN_SND_LIBS += $(OCGDIR)/intern/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a
     NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a $(NAN_OPENAL)/lib/libsmpeg.a
     NAN_SND_LIBS += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
    endif
  else




    LLIBS += -L$(NAN_ODE)/lib -lode
    LOPTS = -export-dynamic
    DADD = -lGL -lGLU
    # SADD = $(NAN_MESA)/lib/libGL.a $(NAN_MESA)/lib/libGLU.a
    DYNLDFLAGS = -shared $(LDFLAGS)
  endif
  ifeq ($(CPU),powerpc)
    COMMENT = "MESA 3.1"
    LLIBS = -L/usr/X11R6/lib/ -lXmu -lXext -lX11 -lc -ldl -lm -lutil
    DADD = -lGL -lGLU
    # SADD = /usr/lib/libGL.a /usr/lib/libGLU.a
    LOPTS = -export-dynamic
  endif
    LLIBS += -lz

Return to bug 26154

Lines 305-323 Link Here

(-)blender-2.28-vanilla/source/Makefile (-8 / +8 lines)
305	ifeq ($(OS),linux)	305	ifeq ($(OS),linux)
306	ifeq ($(CPU),alpha)	306	ifeq ($(CPU),alpha)
307	BINTARGETS = blenderdynamic	307	BINTARGETS = blenderdynamic
308	BINTARGETS += blenderplayer	308	# BINTARGETS += blenderplayer
309	endif	309	endif
310	ifeq ($(CPU),i386)	310	ifeq ($(CPU),i386)
311	BINTARGETS = plugin	311	# BINTARGETS = plugin
312	# BINTARGETS += ptest	312	# BINTARGETS += ptest
313	BINTARGETS += xplink	313	# BINTARGETS += xplink
314	BINTARGETS += blenderdynamic	314	BINTARGETS = blenderdynamic
315	BINTARGETS += blenderplayer	315	# BINTARGETS += blenderplayer
316	BINTARGETS += blenderstatic	316	# BINTARGETS += blenderstatic
317	endif	317	endif
318	ifeq ($(CPU),powerpc)	318	ifeq ($(CPU),powerpc)
319	BINTARGETS = blenderdynamic	319	BINTARGETS = blenderdynamic
320	BINTARGETS += blenderstatic	320	# BINTARGETS += blenderstatic
321	endif	321	endif
322	PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a	322	PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
323	PYLIB += $(NAN_MXTEXTTOOLS)	323	PYLIB += $(NAN_MXTEXTTOOLS)
Lines 355-361 Link Here
355	NAN_SND_LIBS = $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a	355	NAN_SND_LIBS = $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
356	NAN_SND_LIBS += $(OCGDIR)/intern/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a	356	NAN_SND_LIBS += $(OCGDIR)/intern/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
357	NAN_SND_LIBS += $(OCGDIR)/intern/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a	357	NAN_SND_LIBS += $(OCGDIR)/intern/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a
358	NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a	358	NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a $(NAN_OPENAL)/lib/libsmpeg.a
359	NAN_SND_LIBS += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a	359	NAN_SND_LIBS += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
360	endif	360	endif
361	else	361	else

Lines 98-111 Link Here

(-)blender-2.28-vanilla/source/nan_link.mk (-2 / +2 lines)
98	LLIBS += -L$(NAN_ODE)/lib -lode	98	LLIBS += -L$(NAN_ODE)/lib -lode
99	LOPTS = -export-dynamic	99	LOPTS = -export-dynamic
100	DADD = -lGL -lGLU	100	DADD = -lGL -lGLU
101	SADD = $(NAN_MESA)/lib/libGL.a $(NAN_MESA)/lib/libGLU.a	101	# SADD = $(NAN_MESA)/lib/libGL.a $(NAN_MESA)/lib/libGLU.a
102	DYNLDFLAGS = -shared $(LDFLAGS)	102	DYNLDFLAGS = -shared $(LDFLAGS)
103	endif	103	endif
104	ifeq ($(CPU),powerpc)	104	ifeq ($(CPU),powerpc)
105	COMMENT = "MESA 3.1"	105	COMMENT = "MESA 3.1"
106	LLIBS = -L/usr/X11R6/lib/ -lXmu -lXext -lX11 -lc -ldl -lm -lutil	106	LLIBS = -L/usr/X11R6/lib/ -lXmu -lXext -lX11 -lc -ldl -lm -lutil
107	DADD = -lGL -lGLU	107	DADD = -lGL -lGLU
108	SADD = /usr/lib/libGL.a /usr/lib/libGLU.a	108	# SADD = /usr/lib/libGL.a /usr/lib/libGLU.a
109	LOPTS = -export-dynamic	109	LOPTS = -export-dynamic
110	endif	110	endif
111	LLIBS += -lz	111	LLIBS += -lz