projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-2.140.136'
[feisty_meow.git]
/
nucleus
/
applications
/
bundler
/
makefile.bundle_creator
diff --git
a/nucleus/applications/bundler/makefile.bundle_creator
b/nucleus/applications/bundler/makefile.bundle_creator
index 57ac43336f81b70a2464da547e9e6f604c4e09df..78cff28e5753cee884eb41fc85f51a463f41a37b 100644
(file)
--- a/
nucleus/applications/bundler/makefile.bundle_creator
+++ b/
nucleus/applications/bundler/makefile.bundle_creator
@@
-11,14
+11,7
@@
endif
DEFINITIONS += __BUILD_STATIC_APPLICATION__=t
TARGETS = bundle_creator.exe
DEFINITIONS += __BUILD_STATIC_APPLICATION__=t
TARGETS = bundle_creator.exe
-#hmmm: these should be done with a USE_ZLIB macro.
-ifeq "$(COMPILER)" "VISUAL_CPP"
- LOCAL_HEADERS += $(THIRD_PARTY_DIR)/zlib/include
- LOCAL_LIBRARIES += $(THIRD_PARTY_DIR)/zlib/lib
- LIBS_USED += zlib.lib
-else
- LIBS_USED += z
-endif
+LIBS_USED += z
include cpp/rules.def
include cpp/rules.def