diff options
| author | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2009-12-09 20:53:52 +0300 |
|---|---|---|
| committer | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2009-12-09 20:53:52 +0300 |
| commit | e68dff3e76f4f582aa6f90be567d5bd4b64435bf (patch) | |
| tree | e5990d5cdd455382c0c70045fee183e177137091 /source | |
| parent | b4d8d51a26caf9a006bd74c4c7207dc56c5f0855 (diff) | |
Move libpython.a to COMLIB (before was PULIB).
Diffstat (limited to 'source')
| -rw-r--r-- | source/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/Makefile b/source/Makefile index a106e655e78..e503fdc3302 100644 --- a/source/Makefile +++ b/source/Makefile @@ -177,6 +177,7 @@ COMLIB += $(OCGDIR)/blender/makesdna/$(DEBUG_DIR)libdna.a COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a COMLIB += $(NAN_MEMUTIL)/lib/libmemutil.a COMLIB += $(NAN_PNG)/lib/libpng.a +COMLIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a # This was a PULIB up to circa r25248 COMLIB += $(OCGDIR)/blender/gen_python/$(DEBUG_DIR)libgen_python.a ifeq ($(WITH_QUICKTIME), true) @@ -276,13 +277,12 @@ PULIB += $(OCGDIR)/blender/ed_userpref/$(DEBUG_DIR)libed_userpref.a PULIB += $(OCGDIR)/blender/ed_gpencil/$(DEBUG_DIR)libed_gpencil.a PULIB += $(OCGDIR)/blender/ed_opsound/$(DEBUG_DIR)libed_opsound.a PULIB += $(OCGDIR)/blender/windowmanager/$(DEBUG_DIR)libwindowmanager.a -PULIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a PULIB += $(OCGDIR)/blender/makesrna/$(DEBUG_DIR)librna.a # note, no idea but it suddenly doesn't compile :( PULIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a PULIB += $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a PULIB += $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a -PULIB += $(NAN_SMOKE)/lib/$(DEBUG_DIR)/libsmoke.a +PULIB += $(NAN_SMOKE)/lib/$(DEBUG_DIR)libsmoke.a ifeq ($(NAN_NO_KETSJI),true) PULIB += $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a |