updates to fix bundler on win32

[feisty_meow.git] / nucleus / applications / bundler / makefile

diff --git a/nucleus/applications/bundler/makefile b/nucleus/applications/bundler/makefile
index 1137f980e78ea3e92c0c9e51dd596df4f7904bb6..64638c93900c4fd6fea1c6e31c879957fa8e1807 100644 (file)
--- a/nucleus/applications/bundler/makefile
+++ b/nucleus/applications/bundler/makefile
@@ -1,27 +1,29 @@
-CONSOLE_MODE = true
+include variables.def
 
-include cpp/variables.def
+# had to move to this style for these two
+# since having a makefile call another was doing
+# really unpredictable things, where the makefile
+# passed to the -f of make was actually dragging
+# in bits from the main makefile.  this was
+# tested even by saying:
+#   make -f makefile.stub clean
+# which totally isolates it to the stub file, but
+# the main makefile was still being pulled in.
+# hopefully this approach of having a neutral outer
+# maker will get rid of that broken behavior.
 
-PROJECT = app_bundle
-TYPE = application
-SOURCE = common_bundle.cpp 
-ifeq "$(OMIT_VERSIONS)" ""
-  SOURCE += bundler_version.rc
-endif
-DEFINITIONS += __BUILD_STATIC_APPLICATION__=t
-TARGETS = bundle_creator.exe
-LAST_TARGETS += make_stub
-ifeq "$(OP_SYSTEM)" "WIN32"
-  LOCAL_HEADERS += $(THIRD_PARTY_DIR)/zlib/include
-  LOCAL_LIBRARIES += $(THIRD_PARTY_DIR)/zlib/lib
-  LIBS_USED += zlib.lib
-endif
-ifeq "$(OP_SYSTEM)" "UNIX"
-  LIBS_USED += z
-endif
+PROJECT = bundler_app
+LAST_TARGETS = maker
+OTHER_CLEANS = breaker
 
-include cpp/rules.def
+include rules.def
+
+maker:
+       $(MAKE) -f makefile.bundle_creator
+       $(MAKE) -f makefile.unpacker_stub
+
+breaker:
+       $(MAKE) -f makefile.bundle_creator clean
+       $(MAKE) -f makefile.unpacker_stub clean
 
-make_stub:
-       $(MAKE) -f makefile.stub