builds in mingw, but doesn't work

Author: akavel

GOnpp/goCommands/goCommand.cpp

@@ -169,16 +169,17 @@ BOOL goCommand::initializeGoVals(void){
 		return FALSE;
 	}
 
-	dir = _tcstok_s(dir, pathSep, &pkg);
+	dir = _tcstok(dir, pathSep);
 	_tcsncpy(this->goPath, dir, _tcslen(dir)+1);
 	while(dir != NULL){
+		pkg = dir + _tcslen(dir) + 1;
 		if (_tcscmp(dir, TEXT("src")) == 0){
 			_tcsncpy(this->goPkg, pkg, _tcslen(pkg)+1);
 			free(start_address);
 			return TRUE;
 		}
 		PathAppend(this->goPath, dir);
-		dir = _tcstok_s(NULL, pathSep, &pkg);
+		dir = _tcstok(NULL, pathSep);
 	}
 	free(start_address);
 	return FALSE;

makefile

@@ -38,8 +38,8 @@ WINDRES =  windres -O coff
 CFLAGS  =  -O2 -mtune=i686 -DBUILD_DLL -W -Wall -gstabs -mwindows \
            $(foreach dir,$(SRC_DIRS),-I$(dir)) \
            -DUNICODE -D_UNICODE
-LIBS    =  -lws2_32 -lz -lm -Wl,-Map,$@.map,--cref -static-libgcc
-LDFLAGS =  -Wl,--out-implib,$(TARGET) -shared -lshlwapi $(CFLAGS)
+LIBS    =  -lws2_32 -lm -Wl,-Map,$@.map,--cref -static-libgcc -lshlwapi
+LDFLAGS =  -Wl,--out-implib,$(TARGET) -shared $(CFLAGS)
 OBJDIR  =  .objs
 
 #INSTALL_PATH = "C:\\Program Files\\Notepad++\\plugins\\"
@@ -92,9 +92,9 @@ $(OBJDIR)/%.o: %.cpp
 
 $(TARGET): $(OBJS)
 	@echo Linking $@
-	@$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
+	@$(CXX) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
 
-$(OBJDIR)/%.res: %.rc %.ico %.h
+$(OBJDIR)/GOnpp/DockingFeature/goLine.res: GOnpp/DockingFeature/goLine.rc GOnpp/DockingFeature/resource.h
 	@$(call MKDIR-P,$(call dirname,$@))
 	@$(WINDRES) -o $@ $<