X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Fcpp%2Fvariables.def;h=72a16136c76f87842e40b041f6a4819763bdc10d;hb=fc8ec007bcbe990fc374f1a3019547e13554c496;hp=a89040719f26b1350c3c9bfbdfa7e9ee002aa7c2;hpb=2952ccf47b80174880141a7ecfa122089f349b8d;p=feisty_meow.git

diff --git a/scripts/clam/cpp/variables.def b/scripts/clam/cpp/variables.def
index a8904071..72a16136 100644
--- a/scripts/clam/cpp/variables.def
+++ b/scripts/clam/cpp/variables.def
@@ -11,7 +11,7 @@ ifneq "$(BUILD_PARAMETER_FILE)" ""
 endif
 ifeq "$(PARAMETER_FILE)" ""
   # last ditch attempt to get one that will work.
-  export PARAMETER_FILE = $(REPOSITORY_DIR)/build.ini
+  export PARAMETER_FILE = $(PRODUCTION_DIR)/build.ini
 endif
 
 ###############################################################################
@@ -22,12 +22,12 @@ include variables.def
 ###############################################################################
 
 #no # set the repository directory if it's still set to the base version.
-#ifeq "$(REPOSITORY_DIR)" ""
+#ifeq "$(FEISTY_MEOW_DIR)" ""
 #  ifeq "$(OP_SYSTEM)" "UNIX"
-#    export REPOSITORY_DIR = $(HOME)/hoople
+#    export FEISTY_MEOW_DIR = $(HOME)/hoople
 #  endif
 #  ifeq "$(OP_SYSTEM)" "WIN32"
-#    export REPOSITORY_DIR = l:
+#    export FEISTY_MEOW_DIR = l:
 #  endif
 #endif
 
@@ -42,17 +42,18 @@ export BASE_CPU
 
 # set the CPU to a default if it has not been set previously.
 ifeq "$(BASE_CPU)" ""
-  ifneq "$(OP_SYSTEM)" "WIN32"
-    BASE_CPU := $(shell machine 2>/dev/null || arch 2>/dev/null || echo i686)
-  endif
-  ifeq "$(BASE_CPU)" ""
+#  ifneq "$(OP_SYSTEM)" "WIN32"
+    BASE_CPU := $(shell machine 2>/dev/null || arch 2>/dev/null || uname -m 2>/dev/null || echo i686)
+#  endif
+
+#  ifeq "$(BASE_CPU)" ""
 #    BASE_CPU := $(shell uname -m)
-    BASE_CPU := $(shell arch)
-    ifeq "$(BASE_CPU)" ""
-      # failed to get the cpu type.
-      BASE_CPU := x86
-    endif
-  endif
+#    BASE_CPU := $(shell arch)
+#    ifeq "$(BASE_CPU)" ""
+#      # failed to get the cpu type.
+#      BASE_CPU := x86
+#    endif
+#  endif
 endif
 
 # COMPILER is a flag that specifies the compiler that will be used to build
@@ -183,14 +184,7 @@ FLAG_FILES += $(BUILD_LIST_FILE) $(BUILD_WHACK_FILE)
 # "THIRD_PARTY_DIR" is the root of our support libraries.
 export THIRD_PARTY_DIR
 ifeq "$(THIRD_PARTY_DIR)" ""
-  export THIRD_PARTY_DIR := $(shell bash -c '\
-    if [ -d "$(REPOSITORY_DIR)/3rdparty" ]; then \
-      echo "$(REPOSITORY_DIR)/3rdparty"; \
-    elif [ -d "$(REPOSITORY_DIR)/libraries/3rdparty" ]; then \
-      echo "$(REPOSITORY_DIR)/libraries/3rdparty"; \
-    else \
-      echo ""; \
-    fi')
+  export THIRD_PARTY_DIR := "$(PRODUCTION_DIR)/3rdparty"
 endif
 
 # "OUTPUT_ROOT" is the root of all output directories for objects and other
@@ -215,7 +209,7 @@ export BASE_OUTPUT_PATH = $(OUTPUT_ROOT)/$(CPU_BUILD_DIR)
 
 # special case when doing arm-linux builds
 ifeq "$(COMPILER)" "GNU_ARM_LINUX"
-  export TARGETS_DIR = $(REPOSITORY_DIR)/$(CPU_BUILD_DIR)
+  export TARGETS_DIR = $(FEISTY_MEOW_DIR)/$(CPU_BUILD_DIR)
   # special output directory for firmware doesn't include CPU name because
   #  the repository already include the CPU name
   BASE_OUTPUT_PATH = $(OUTPUT_ROOT)
@@ -232,7 +226,6 @@ export OBJECT_DIR = $(OUTPUT_PATH)
 export EXECUTABLE_DIR = $(TARGETS_DIR)
 export DYNAMIC_LIBRARY_DIR = $(TARGETS_DIR)
 export STATIC_LIBRARY_DIR = $(TARGETS_DIR)
-#export TESTS_DIR = $(TARGETS_DIR)/tests
 
 # "HEADER_SEARCH_PATH" is where the class interface files are to be found.
 #HEADER_SEARCH_PATH =
@@ -241,8 +234,8 @@ export STATIC_LIBRARY_DIR = $(TARGETS_DIR)
 ifeq "$(HOOPLE_HEADERS)" ""
 #seems like some of this is redundant with earlier 3rdparty exploring.
   LOCUS_LIBRARY_HEADERS = $(shell bash -c '\
-    if [ -d "$(REPOSITORY_DIR)/core" ]; then \
-      echo "$(REPOSITORY_DIR)/core" "$(REPOSITORY_DIR)/octopi" "$(REPOSITORY_DIR)/graphiq" ; \
+    if [ -d "$(FEISTY_MEOW_DIR)/nucleus" ]; then \
+      echo "$(FEISTY_MEOW_DIR)/nucleus" "$(FEISTY_MEOW_DIR)/octopi" "$(FEISTY_MEOW_DIR)/graphiq" ; \
     else \
       echo ""; \
     fi | sed -e "s/\([a-zA-Z]\):\/\(.*\)/\/\1\/\2/" ')
@@ -469,10 +462,7 @@ ifeq "$(COMPILER)" "GNU_LINUX"
   DEFINITIONS += _FILE_OFFSET_BITS=64 
 
   DEPENDENCY_DEFINITIONS += NO_VERSION
-  DEPENDENCY_ADDITIONS = -X/usr/include -X/usr/include/c++/$(COMPILER_VERSION) -X/usr/include/c++/$(COMPILER_VERSION)/tr1 -X/usr/local/include -X/usr/include/linux -X/usr/include/wx-2.8 -X/usr/lib/gcc/i586-suse-linux/$(COMPILER_VERSION)/include -X/usr/lib/gcc/i486-linux-gnu/$(COMPILER_VERSION)/include -X/usr/lib/gcc/i686-linux-gnu/$(COMPILER_VERSION)/include
-
-#protect other additions to make them only for debian?
-#  COMPILER_HEADER_DIR := /usr/include /usr/local/include 
+  DEPENDENCY_ADDITIONS = -X/usr/include -X/usr/include/c++/$(COMPILER_VERSION) -X/usr/include/c++/$(COMPILER_VERSION)/tr1 -X/usr/local/include -X/usr/include/linux -X/usr/include/wx-2.8 -X/usr/lib/gcc/i586-suse-linux/$(COMPILER_VERSION)/include -X/usr/lib/gcc/i486-linux-gnu/$(COMPILER_VERSION)/include -X/usr/lib/gcc/i686-linux-gnu/$(COMPILER_VERSION)/include -X/usr/lib/gcc/x86_64-linux-gnu/$(COMPILER_VERION)/include -X/usr/include/x86_64-linux-gnu
 
   # "USE_XWIN" specifies that this project needs X window system support.
   #USE_XWIN =
@@ -681,8 +671,8 @@ ifeq "$(COMPILER)" "VISUAL_CPP"
   export PDB_DIR = $(TARGETS_DIR)
 
   # set these way up here so we can override them later.
-  CC = $(COMPILER_ROOT_DIR)/bin/cl
-  LINK_TOOL = $(COMPILER_ROOT_DIR)/bin/link
+  CC = bash $(BUILD_SCRIPTS_DIR)/wrapdoze.sh $(COMPILER_ROOT_DIR)/bin/cl
+  LINK_TOOL = bash $(BUILD_SCRIPTS_DIR)/wrapdoze.sh $(COMPILER_ROOT_DIR)/bin/link
 
   # This is needed to protect against the use of 64-bit time_t structure
   # on windows.  We are casting to time_t from a 32-bit structure.