Update of /cvsroot/cbar/cbar/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13756/misc
Modified Files:
makefile.all makefile.vc
Log Message:
Made the it build in msvc
Index: makefile.all
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.all,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** makefile.all 16 Feb 2004 07:21:34 -0000 1.5
--- makefile.all 27 Feb 2004 23:56:04 -0000 1.6
***************
*** 204,208 ****
dat: $(CBAR_DAT_C_X)
! $(CBAR_DAT_C) $(CBAR_DAT_H): $(CBAR_DAT_X)
-$(CGUI_DAT2C) $(CBAR_DAT) -o $(CBAR_DAT_C) -h $(CBAR_DAT_H) -p cbar -g -n labels
--- 204,208 ----
dat: $(CBAR_DAT_C_X)
! $(CBAR_DAT_C_X) $(CBAR_DAT_H): $(CBAR_DAT_X)
-$(CGUI_DAT2C) $(CBAR_DAT) -o $(CBAR_DAT_C) -h $(CBAR_DAT_H) -p cbar -g -n labels
Index: makefile.vc
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.vc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** makefile.vc 8 Feb 2004 11:34:11 -0000 1.5
--- makefile.vc 27 Feb 2004 23:56:05 -0000 1.6
***************
*** 45,50 ****
ifdef STATICLINK
# link as a static library
! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s
! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s
IMPLIB_BASENAME = $(PACKAGE5)_s$(LIB_SUFFIX)
IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
--- 45,50 ----
ifdef STATICLINK
# link as a static library
! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s
! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s
IMPLIB_BASENAME = $(PACKAGE5)_s$(LIB_SUFFIX)
IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
***************
*** 52,57 ****
else
# link as a DLL
! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)
! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)
DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll
DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME)
--- 52,57 ----
else
# link as a DLL
! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)
! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)
DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll
DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME)
***************
*** 125,128 ****
--- 125,129 ----
ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X))
+ CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X))
CBAR_DAT = $(subst \,/,$(CBAR_DAT_X))
CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X))
***************
*** 135,138 ****
--- 136,140 ----
ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X))
ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X))
+ CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X))
CBAR_DAT = $(subst /,\,$(CBAR_DAT_X))
CBAR_DAT_C = $(subst /,\,$(CBAR_DAT_C_X))
|
