Changeset 244 in Main for trunk


Ignore:
Timestamp:
Oct 4, 2024, 5:04:15 AM (6 weeks ago)
Author:
Nishi
Message:

adding gui manager

Location:
trunk
Files:
5 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    r240 r244  
    66PREFIX = /usr/local
    77MODULE = ./Module
     8OBJ = o
    89
    910include Platform/$(PLATFORM).mk
    … …  
    2526
    2627./Server:: ./Common ./Tool/option ./Tool/genconf ./Tool/itworks
    27         $(MAKE) -C $@ $(FLAGS) EXTOBJS="`./Tool/option objs ../`" EXTLIBS="`./Tool/option libs ../ $(PLATFORM_IDENT)`" EXTCFLAGS="`./Tool/option cflags ../`" EXTLDFLAGS="`./Tool/option ldflags ../`"
     28        $(MAKE) -C $@ $(FLAGS) EXTOBJS="`./Tool/option objs ../ $(PLATFORM_IDENT) $(OBJ)`" EXTLIBS="`./Tool/option libs ../ $(PLATFORM_IDENT) $(OBJ)`" EXTCFLAGS="`./Tool/option cflags ../ $(PLATFORM_IDENT) $(OBJ)`" EXTLDFLAGS="`./Tool/option ldflags ../ $(PLATFORM_IDENT) $(OBJ)`"
    2829
    2930./Module:: ./Common

  • trunk/Platform/bcc.mk

    r240 r244  
    1515LIBSUF = .dll
    1616OBJ = obj
    17 REQOBJS = tewi_bcc.res
     17REQOBJS = tewi_bcc.res gui_bcc.res

  • trunk/Platform/vc6.mk

    r240 r244  
    1414LIBSUF = .dll
    1515OBJ = obj
    16 PREOBJS = tewi_vc6.res
     16PREOBJS = tewi_vc6.res gui_vc6.res

  • trunk/Platform/watcom.mk

    r240 r244  
    1414LIBSUF = .dll
    1515OBJ = obj
    16 SERVADD = wrc -bt=nt -i=$(WATCOM)/h/nt -fe=tewi.exe tewi.rc
     16SERVADD = wrc -bt=nt -i=$(WATCOM)/h/nt tewi.rc tewi.exe && wrc -bt=nt -i=$(WATCOM)/h/nt gui.rc tewi.exe

  • trunk/Platform/win32.mk

    r240 r244  
    1212EXEC = .exe
    1313LIBSUF = .dll
    14 PREOBJS = tewi.res
     14PREOBJS = tewi.res gui.res

  • trunk/Platform/win64.mk

    r240 r244  
    1212EXEC = .exe
    1313LIBSUF = .dll
    14 PREOBJS = tewi.res
     14PREOBJS = tewi.res gui.res

  • trunk/Server/Makefile

    r215 r244  
    5555        brc32 -r -fo$@ tewi.rc
    5656
     57gui.res: gui.rc gui.h
     58        $(WINDRES) gui.rc -O coff -o $@
     59
     60gui_vc6.res: gui.rc gui.h
     61        rc /fo$@ gui.rc
     62
     63gui_bcc.res: gui.rc gui.h
     64        brc32 -r -fo$@ gui.rc
     65
    5766clean:
    5867        rm -f *.o tewi *.exe *.res *.elf *.sfo *.pbp *.self *.pkg *.obj

  • trunk/Server/main.c

    r219 r244  
    88
    99#pragma resource "tewi_bcc.res"
     10#pragma resource "gui_bcc.res"
    1011
    1112#endif
    … …  
    3132#include "tw_version.h"
    3233
    33 #if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__)
     34#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
    3435#include <windows.h>
    3536#endif
    … …  
    525526#endif
    526527
     528#if !defined(BUILD_GUI) || !(defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__))
    527529int main(int argc, char** argv) {
    528530        int st;
    … …  
    705707        return 0;
    706708}
     709#endif
    707710
    708711int startup(int argc, char** argv) {

  • trunk/Server/tewi.rc

    r128 r244  
    33#include "../config.h"
    44
    5 id ICON "../Binary/tewi.ico"
     5TEWI ICON "../Binary/tewi.ico"
    66VS_VERSION_INFO VERSIONINFO
    77        FILEVERSION 1,0,0,0

  • trunk/Tool/option.c

    r240 r244  
    1515                printf("-I %s/openssl/include", argv[2]);
    1616#endif
     17#ifdef BUILD_GUI
     18                if(strcmp(argv[3], "WINDOWS_WATCOM") == 0){
     19                        printf(" -b nt_win");
     20                }else if(strcmp(argv[3], "WINDOWS") == 0){
     21                        printf(" -mwindows");
     22                }
     23#endif
    1724        } else if(strcmp(argv[1], "ldflags") == 0) {
    1825#ifndef NO_SSL
    1926                printf("-L %s/openssl/lib", argv[2]);
    2027#endif
     28#ifdef BUILD_GUI
     29                if(strcmp(argv[3], "WINDOWS_WATCOM") == 0){
     30                        printf(" -b nt_win");
     31                }else if(strcmp(argv[3], "WINDOWS") == 0){
     32                        printf(" -mwindows");
     33                }
     34#endif
    2135        } else if(strcmp(argv[1], "objs") == 0) {
    2236#ifndef NO_SSL
    23                 printf("ssl.o");
     37                printf("ssl.%s", argv[4]);
     38#endif
     39#ifdef BUILD_GUI
     40                if(strcmp(argv[3], "WINDOWS") == 0 || strcmp(argv[3], "WINDOWS_WATCOM") == 0){
     41                        printf(" gui.%s", argv[4]);
     42                }
    2443#endif
    2544        } else if(strcmp(argv[1], "libs") == 0) {
    … …  
    3352                        printf(" -lws2_32");
    3453#endif
     54#ifdef BUILD_GUI
     55                        printf(" -lcomctl32");
     56#endif
    3557                }else if(strcmp(argv[3], "WINDOWS_WATCOM") == 0){
    3658#ifdef USE_WINSOCK1
    … …  
    3961                        printf(" ws2_32.lib");
    4062#endif
     63#ifdef BUILD_GUI
     64                        printf(" comctl32.lib");
     65#endif
    4166                }
    4267        }

  • trunk/config.h.tmpl

    r240 r244  
    1212#undef NO_GETADDRINFO
    1313#undef USE_WINSOCK1
     14#undef BUILD_GUI
    1415
    1516/* DO NOT EDIT BELOW THIS LINE */
    … …  
    2324/* Force select(2) for Windows */
    2425#endif
     26
    2527#if (defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)) && defined(USE_WINSOCK1) && !defined(NO_GETADDRINFO)
    2628#define NO_GETADDRINFO
Note: See TracChangeset for help on using the changeset viewer.