Changeset 16574 for gsdl/trunk/runtime-src/src/w32server/win32.mak

Timestamp:

2008-07-28T23:46:12+12:00 (16 years ago)

Author:

davidb

Message:

Adjustments to Windows makes file for new common-src, build-src and runtime-src file structure

File:

• gsdl/trunk/runtime-src/src/w32server/win32.mak (modified) (4 diffs)

gsdl/trunk/runtime-src/src/w32server/win32.mak

@@ -25 +25 @@
 ###########################################################################
 
-GSDL_DIR = ..\..
-INDEXERS_DIR = $(GSDL_DIR)\indexers
-PACKAGES_DIR = $(GSDL_DIR)\packages
-COLSERVR_DIR = $(GSDL_DIR)\src\colservr
-PROTOCOL_DIR = $(GSDL_DIR)\src\protocol
-RECPT_DIR = $(GSDL_DIR)\src\recpt
+GSDL_DIR = ..\..\..
+COMMON_DIR = $(GSDL_DIR)\common-src
+RUNTIME_DIR = $(GSDL_DIR)\runtime-src
+
+INDEXERS_DIR = $(COMMON_DIR)\indexers
+PACKAGES_DIR = $(RUNTIME_DIR)\packages
+COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr
+PROTOCOL_DIR = $(RUNTIME_DIR)\protocol
+RECPT_DIR    = $(RUNTIME_DIR)\src\recpt
 
 
@@ -60 +63 @@
 CC = cl
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_LITTLE_ENDIAN -DPARADOCNUM -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
-INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
-    -I"$(GSDL_DIR)\src\colservr" -I"$(GSDL_DIR)\indexers\mg" \
+INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
+    -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mg" \
     -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" \
-        -I"$(GSDL_DIR)\indexers\mg\lib" -I"$(GSDL_DIR)\indexers\mg\src\text" \
-        -I"$(GSDL_DIR)\indexers\mgpp\lib" -I"$(GSDL_DIR)\indexers\mgpp\text"
+        -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \
+        -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text"
 LDFLAGS =
 LIBS = "$(PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
@@ -132 +135 @@
     "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
     "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" \
-    "$(GSDL_DIR)\src\lib\gsdllib.lib"
+    "$(COMMON_DIR)\src\lib\gsdllib.lib"
 
 EXECUTABLE_OBJECTS = \
@@ -156 +159 @@
 
 # Resources stuff
-SOURCE = "$(GSDL_DIR)\src\w32server\newgsdl.bmp"
-SOURCE = "$(GSDL_DIR)\src\w32server\resource.h"
-SOURCE = "$(GSDL_DIR)\src\w32server\server.ico"
-SOURCE = "$(GSDL_DIR)\src\w32server\gsdlcol.bmp"
-SOURCE = "$(GSDL_DIR)\src\w32server\server.rc"
+SOURCE = "$(RUNTIME_DIR)\src\w32server\newgsdl.bmp"
+SOURCE = "$(RUNTIME_DIR)\src\w32server\resource.h"
+SOURCE = "$(RUNTIME_DIR)\src\w32server\server.ico"
+SOURCE = "$(RUNTIME_DIR)\src\w32server\gsdlcol.bmp"
+SOURCE = "$(RUNTIME_DIR)\src\w32server\server.rc"
 DEP_RSC_SERVE=\
-    "$(GSDL_DIR)\src\w32server\gsdlcol.bmp"\
-    "$(GSDL_DIR)\src\w32server\newgsdl.bmp"\
-    "$(GSDL_DIR)\src\w32server\server.ico"
+    "$(RUNTIME_DIR)\src\w32server\gsdlcol.bmp"\
+    "$(RUNTIME_DIR)\src\w32server\newgsdl.bmp"\
+    "$(RUNTIME_DIR)\src\w32server\server.ico"
 
-server.res : $(SOURCE) $(DEP_RSC_SERVE) "$(GSDL_DIR)\src\w32server"
-   $(RSC) /l 0x409 /fo"$(GSDL_DIR)\src\w32server\server.res" /i "$(GSDL_DIR)\src\w32server" \
+server.res : $(SOURCE) $(DEP_RSC_SERVE) "$(RUNTIME_DIR)\src\w32server"
+   $(RSC) /l 0x409 /fo"$(RUNTIME_DIR)\src\w32server\server.res" /i "$(RUNTIME_DIR)\src\w32server" \
  /d "NDEBUG" $(SOURCE)
 
-"$(GSDL_DIR)\src\w32server\server.res" : $(SOURCE) $(DEP_RSC_SERVE) "$(GSDL_DIR)\src\w32server"
-   $(RSC) /l 0x409 /fo"$(GSDL_DIR)\src\w32server\server.res" /i "$(GSDL_DIR)\src\w32server" \
+"$(RUNTIME_DIR)\src\w32server\server.res" : $(SOURCE) $(DEP_RSC_SERVE) "$(RUNTIME_DIR)\src\w32server"
+   $(RSC) /l 0x409 /fo"$(RUNTIME_DIR)\src\w32server\server.res" /i "$(RUNTIME_DIR)\src\w32server" \
  /d "NDEBUG" $(SOURCE)